devflow-cli 8.5.0__py3-none-any.whl → 8.5.1__py3-none-any.whl

devflow_cli/__init__.py

@@ -1,6 +1,6 @@
 """devflow CLI — workflow de développement adaptatif."""
 
-VERSION = "8.5.0"
+VERSION = "8.5.1"
 
 SUPPORTED_AGENTS = ["claude-code", "codex", "cursor"]
 

devflow_cli/commands/adaptive.py

@@ -17,6 +17,7 @@ from devflow_cli import VERSION
 from devflow_cli.adapters.linear import sync_activity_status
 from devflow_cli.core.adaptive_workflow import (
     AdaptiveWorkflowState,
+    adaptive_state_violation,
     complete_activity,
     create_adaptive_workflow,
     read_adaptive_state,
@@ -148,8 +149,12 @@ def _state(
         raise typer.Exit(LEGACY_SCHEMA_EXIT_CODE) from exc
     if state is None:
         diagnostic = diagnose_contract_file("workflow-state", state_file)
-        detail = (
-            diagnostic or "workflow-state.json respecte le schema mais ses invariants "
+        violation = None if diagnostic else adaptive_state_violation(state_file)
+        detail = diagnostic or (
+            "workflow-state.json respecte le schema mais viole le verrou "
+            f"{violation}."
+            if violation
+            else "workflow-state.json respecte le schema mais ses invariants "
             "métier sont incoherents."
         )
         if json_output:
@@ -198,10 +203,10 @@ def start(feature: str = typer.Argument(..., help="ID ou dossier de la feature")
             enter_current_activity(
                 state, project_root_for_feature(feature_dir), feature_dir
             )
+            write_adaptive_state(state_file, state)
         except (OSError, ValueError) as exc:
             fail(f"Impossible de demarrer le workflow : {exc}")
             raise typer.Exit(int(ExitCode.INVALID_CONTRACT)) from exc
-        write_adaptive_state(state_file, state)
     safe_refresh_worklog(feature_dir)
     ok(
         f"Workflow {state.profile} demarre. "
@@ -256,11 +261,11 @@ def complete(
             enter_current_activity(
                 state, project_root_for_feature(feature_dir), feature_dir
             )
+            write_adaptive_state(feature_dir / "workflow-state.json", state)
         except (OSError, ValueError) as exc:
             fail(str(exc))
             console.print(f"  Suite : devflow adaptive status {state.issueId}")
             raise typer.Exit(int(ExitCode.BLOCKED)) from exc
-        write_adaptive_state(feature_dir / "workflow-state.json", state)
     safe_refresh_worklog(feature_dir)
     if activity == "done":
         sync_activity_status(state.issueId, "done", run_progress.progress_stream(False))
@@ -284,10 +289,10 @@ def evidence(
         state = _state(feature_dir)
         try:
             record_evidence(state, evidence_id, report or "")
+            write_adaptive_state(feature_dir / "workflow-state.json", state)
         except ValueError as exc:
             fail(str(exc))
             raise typer.Exit(int(ExitCode.BLOCKED)) from exc
-        write_adaptive_state(feature_dir / "workflow-state.json", state)
     safe_refresh_worklog(feature_dir)
     ok(f"Preuve '{evidence_id}' enregistree.")
     warn("Source manuelle : cette preuve ne valide pas les gates du workflow.")
@@ -903,11 +908,11 @@ def reopen(
             enter_current_activity(
                 state, project_root_for_feature(feature_dir), feature_dir
             )
+            write_adaptive_state(feature_dir / "workflow-state.json", state)
         except (OSError, ValueError) as exc:
             fail(str(exc))
             console.print(f"  Suite : devflow adaptive status {state.issueId}")
             raise typer.Exit(int(ExitCode.BLOCKED)) from exc
-        write_adaptive_state(feature_dir / "workflow-state.json", state)
     safe_refresh_worklog(feature_dir)
     ok(
         f"Workflow rouvert sur '{activity}' (audit #{entry['sequence']}, "

devflow_cli/core/adaptive_runner.py

@@ -797,6 +797,7 @@ def _apply_activity_result(
             enter_current_activity(
                 latest, project_root_for_feature(feature_dir), feature_dir
             )
+            write_adaptive_state(state_file, latest)
         except (OSError, ValueError) as exc:
             return AdaptiveRunOutcome(
                 "transition-refused",
@@ -806,7 +807,6 @@ def _apply_activity_result(
                 result,
                 warnings,
             )
-        write_adaptive_state(state_file, latest)
         next_activity = latest.currentActivity
 
     safe_refresh_worklog(feature_dir)

devflow_cli/core/adaptive_workflow.py

@@ -187,32 +187,13 @@ def record_evidence(
     return state
 
 
-def read_adaptive_state(path: Path) -> AdaptiveWorkflowState | None:
-    """Lit un etat coherent, ou None. Un etat produit par devflow 6.x ou 7.x
-    leve ``LegacySchemaError``."""
-    try:
-        data = json.loads(path.read_text(encoding="utf-8"))
-    except (OSError, UnicodeDecodeError, json.JSONDecodeError):
-        return None
-    try:
-        check_schema_version("workflow-state", path, data)
-    except LegacySchemaError:
-        raise
-    except ValueError:
-        return None
-    if (
-        isinstance(data, dict)
-        and data.get("schemaVersion") == ADAPTIVE_STATE_SCHEMA_VERSION
-        and data.get("currentActivity") != "done"
-        and data.get("activityBase") is None
-    ):
-        # Etat sans base : aucune base n'est reconstruite (rupture 8.0.0).
-        raise legacy_workflow_state_error(path, data["schemaVersion"])
-    try:
-        validate_contract_payload("workflow-state", data)
-        state = AdaptiveWorkflowState(**data)
-    except (TypeError, ContractSchemaError):
-        return None
+class StateInvariantError(ValueError):
+    """Etat refuse a l'ecriture : il viole un verrou de la lecture."""
+
+
+def state_invariant_violation(state: AdaptiveWorkflowState) -> str | None:
+    """Verrou metier viole par l'etat, ou None : seule definition, partagee par
+    la lecture et l'ecriture. Le texte commence par le nom stable du verrou."""
     if (
         not isinstance(state.activities, list)
         or not all(isinstance(item, str) for item in state.activities)
@@ -221,7 +202,10 @@ def read_adaptive_state(path: Path) -> AdaptiveWorkflowState | None:
         or not isinstance(state.completedActivities, list)
         or not all(isinstance(item, str) for item in state.completedActivities)
         or not isinstance(state.evidence, dict)
-        or not all(
+    ):
+        return "types : activites, preuves ou activites completees mal typees"
+    for key, entry in state.evidence.items():
+        if not (
             isinstance(key, str)
             and isinstance(entry, dict)
             and isinstance(entry.get("recordedAt"), str)
@@ -230,12 +214,10 @@ def read_adaptive_state(path: Path) -> AdaptiveWorkflowState | None:
             and entry.get("outcome") in {"passed", "failed"}
             and (entry.get("source") in AGENT_SOURCES) == ("agent" in entry)
             and (entry.get("source") == HUMAN_SOURCE) == ("reviewer" in entry)
-            for key, entry in state.evidence.items()
-        )
-    ):
-        return None
+        ):
+            return f"evidence-entry : preuve {key} mal formee"
     if state.profile not in PROFILE_RANK:
-        return None
+        return f"profile : profil inconnu {state.profile}"
     try:
         route = compute_route(
             state.profile,
@@ -243,36 +225,97 @@ def read_adaptive_state(path: Path) -> AdaptiveWorkflowState | None:
             guardrails=state.guardrails,
         )
     except ValueError:
-        return None
+        return f"route : aucune route pour le profil {state.profile}"
+    if state.schemaVersion != ADAPTIVE_STATE_SCHEMA_VERSION:
+        return f"schema-version : version {state.schemaVersion} inattendue"
     if (
-        state.schemaVersion != ADAPTIVE_STATE_SCHEMA_VERSION
-        or state.activities != list(route.activities)
+        state.activities != list(route.activities)
         or state.requiredEvidence != list(route.requiredEvidence)
-        or state.status not in {"active", "completed"}
-        or state.currentActivity not in state.activities
-        or not set(state.completedActivities) <= set(state.activities)
-        or not set(state.evidence) <= set(state.requiredEvidence)
     ):
-        return None
+        return "route : activites ou preuves differentes de la route du profil"
+    if state.status not in {"active", "completed"}:
+        return f"status : statut inconnu {state.status}"
+    if state.currentActivity not in state.activities:
+        return f"current-activity : {state.currentActivity} hors de la route"
+    if not set(state.completedActivities) <= set(state.activities):
+        return "completed-activities : activite completee hors de la route"
+    unexpected = sorted(set(state.evidence) - set(state.requiredEvidence))
+    if unexpected:
+        return f"evidence-ids : preuve non attendue {', '.join(unexpected)}"
     current_index = state.activities.index(state.currentActivity)
     expected_completed = state.activities[:current_index]
     if state.status == "active" and state.completedActivities != expected_completed:
-        return None
+        return (
+            "completed-activities : les activites completees ne sont pas celles "
+            f"qui precedent {state.currentActivity}"
+        )
     for gated_activity in ("verify", "review", "rollback-check"):
         if gated_activity not in state.completedActivities:
             continue
-        if any(
-            item not in state.evidence
-            or state.evidence[item].get("source") not in accepted_evidence_sources(item)
-            or state.evidence[item].get("outcome") != "passed"
-            for item in gate_evidence(state, gated_activity)
-        ):
-            return None
+        for item in gate_evidence(state, gated_activity):
+            if (
+                item not in state.evidence
+                or state.evidence[item].get("source")
+                not in accepted_evidence_sources(item)
+                or state.evidence[item].get("outcome") != "passed"
+            ):
+                return (
+                    f"gate-evidence : {gated_activity} est completee sans la preuve "
+                    f"{item} en passed d'une source acceptee"
+                )
     if state.status == "completed" and (
         state.currentActivity != "done"
         or state.completedActivities != state.activities
         or any(item not in state.evidence for item in state.requiredEvidence)
     ):
+        return "completed-state : parcours termine sans toutes ses activites et preuves"
+    return None
+
+
+def adaptive_state_violation(path: Path) -> str | None:
+    """Verrou viole par un etat conforme au schema, pour nommer un refus de lecture."""
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+        state = AdaptiveWorkflowState(**data)
+    except (OSError, UnicodeDecodeError, json.JSONDecodeError, TypeError):
+        return None
+    violation = state_invariant_violation(state)
+    if violation is not None:
+        return violation
+    try:
+        validate_state_bases(state, feature_path=_state_feature_path(path))
+    except ValueError as exc:
+        return f"bases : {exc}"
+    return None
+
+
+def read_adaptive_state(path: Path) -> AdaptiveWorkflowState | None:
+    """Lit un etat coherent, ou None. Un etat produit par devflow 6.x ou 7.x
+    leve ``LegacySchemaError``."""
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, UnicodeDecodeError, json.JSONDecodeError):
+        return None
+    try:
+        check_schema_version("workflow-state", path, data)
+    except LegacySchemaError:
+        raise
+    except ValueError:
+        return None
+    if (
+        isinstance(data, dict)
+        and data.get("schemaVersion") == ADAPTIVE_STATE_SCHEMA_VERSION
+        and data.get("currentActivity") != "done"
+        and data.get("activityBase") is None
+    ):
+        # Etat sans base : aucune base n'est reconstruite (rupture 8.0.0).
+        raise legacy_workflow_state_error(path, data["schemaVersion"])
+    try:
+        validate_contract_payload("workflow-state", data)
+        state = AdaptiveWorkflowState(**data)
+    except (TypeError, ContractSchemaError):
+        return None
+    if state_invariant_violation(state) is not None:
         return None
     try:
         validate_state_bases(state, feature_path=_state_feature_path(path))
@@ -309,7 +352,13 @@ def workflow_lock(feature_dir: Path) -> Iterator[Path]:
 
 
 def write_adaptive_state(path: Path, state: AdaptiveWorkflowState) -> None:
+    """Ecrit un etat que la lecture accepte ; sinon leve sans toucher au fichier."""
     validate_state_bases(state, feature_path=_state_feature_path(path))
+    violation = state_invariant_violation(state)
+    if violation is not None:
+        raise StateInvariantError(
+            f"etat incoherent non ecrit, verrou viole : {violation}"
+        )
     state.updatedAt = _now_iso()
     payload = state.to_dict()
     validate_contract_payload("workflow-state", payload)

devflow_cli/core/automatic_evidence.py

@@ -15,6 +15,7 @@ from pathlib import Path
 
 from devflow_cli.core.adaptive_workflow import (
     AdaptiveWorkflowState,
+    StateInvariantError,
     complete_activity,
     guardrails_active,
     read_adaptive_state,
@@ -920,7 +921,10 @@ def run_automatic_verification(
                     "transition-refused",
                     f"base de l'activite {latest.currentActivity} non enregistree : {exc}",
                 )
-        write_adaptive_state(state_file, latest)
+        try:
+            write_adaptive_state(state_file, latest)
+        except StateInvariantError as exc:
+            return AutomaticVerificationOutcome(False, "transition-refused", str(exc))
         next_activity = latest.currentActivity
     safe_refresh_worklog(feature_dir)
     detail = (

devflow_cli/core/remediation.py

@@ -6,11 +6,17 @@ import json
 import os
 import shutil
 import tempfile
+from dataclasses import replace
 from datetime import datetime, timezone
 from pathlib import Path
 
 from devflow_cli.core.activity_base import BaseObservationError, files_since_activity_base
-from devflow_cli.core.adaptive_workflow import AdaptiveWorkflowState
+from devflow_cli.core.adaptive_workflow import (
+    AdaptiveWorkflowState,
+    StateInvariantError,
+    gate_evidence,
+    state_invariant_violation,
+)
 from devflow_cli.core.assessment import compute_route
 from devflow_cli.utils.paths import activity_attempt_file, activity_raw_file
 
@@ -41,6 +47,36 @@ def reopen_activity(
             "la cible doit etre une activite deja completee avant l'activite courante"
         )
 
+    activities = list(
+        compute_route(
+            state.profile,
+            contract_change=state.contractChange,
+            guardrails=state.guardrails,
+        ).activities
+    )
+    completed = activities[:activities.index(target)]
+    reopened = replace(
+        state,
+        activities=activities,
+        currentActivity=target,
+        completedActivities=completed,
+        evidence={},
+        status="active",
+    )
+    # Seules restent les preuves des gates des activites encore completees.
+    kept = {
+        item for activity in completed for item in gate_evidence(reopened, activity)
+    }
+    reopened.evidence = {
+        key: entry for key, entry in state.evidence.items() if key in kept
+    }
+    # Verrous controles avant toute trace : un refus n'ecrit ni journal ni archive.
+    violation = state_invariant_violation(reopened)
+    if violation is not None:
+        raise StateInvariantError(
+            f"reouverture refusee, verrou viole : {violation}"
+        )
+
     log_file = feature_dir / "reopen-log.json"
     payload = _read_log(log_file, state.issueId)
     sequence = len(payload["entries"]) + 1
@@ -63,17 +99,11 @@ def reopen_activity(
     payload["entries"].append(entry)
     _write_json_atomic(log_file, payload)
 
-    state.activities = list(
-        compute_route(
-            state.profile,
-            contract_change=state.contractChange,
-            guardrails=state.guardrails,
-        ).activities
-    )
-    state.currentActivity = target
-    state.completedActivities = state.activities[:state.activities.index(target)]
-    state.evidence = {}
-    state.status = "active"
+    state.activities = reopened.activities
+    state.currentActivity = reopened.currentActivity
+    state.completedActivities = reopened.completedActivities
+    state.evidence = reopened.evidence
+    state.status = reopened.status
     return entry
 
 

{devflow_cli-8.5.0.dist-info → devflow_cli-8.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: devflow-cli
-Version: 8.5.0
+Version: 8.5.1
 Summary: Spec-Driven Development workflow CLI
 Project-URL: Homepage, https://github.com/sopequenoteck/devflow
 Project-URL: Repository, https://github.com/sopequenoteck/devflow

{devflow_cli-8.5.0.dist-info → devflow_cli-8.5.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-devflow_cli/__init__.py,sha256=gN1yusVBmKEDSmEtb_g_BPIHNRFR3EDm3BA7mMbPXtQ,925
+devflow_cli/__init__.py,sha256=yUxpKLKephIrgPv-hHWMO6tznMd47ejm6oL_zFuipxA,925
 devflow_cli/cli.py,sha256=0_SmhJX_k7OQfp-jNV_jq9EOgWY4rTjStGIoc9pH6Ec,2686
 devflow_cli/adapters/__init__.py,sha256=RkjHPU2Lp4hSVIq2iOmyTrv2zYU9NuiIF9wEMWzLdMI,377
 devflow_cli/adapters/agents.py,sha256=01ZQb96koWMKH-mma3AtttdEjNEbu3mM89vFetD9iR8,29689
 devflow_cli/adapters/linear.py,sha256=HE1YzjBxwoj2jJ_3bmh9Pn_7Mt5u3EOLk891vMXBEj4,8700
 devflow_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devflow_cli/commands/adaptive.py,sha256=efDFrh9GOfnISzJwc5utP4KchhjyjxagytIwBgQ7N2Q,72537
+devflow_cli/commands/adaptive.py,sha256=8zYUrtPxU3NRpQ4yv0ScHmn8IjQfnx4U24qMW8Y4_Uo,72797
 devflow_cli/commands/assess.py,sha256=V-E3ft41ljCrqp2WLjR1Dqw-JtswcqsK2nD1-euNbNE,5655
 devflow_cli/commands/check.py,sha256=hsfeOg9yDOTAIvNm6XhRmTIFgv7w9wC8zvrwm4ojfZs,6923
 devflow_cli/commands/context.py,sha256=hwTitOHxIpJMx1X8R1jHHy9CpE4HVZpJKkyeOujxAio,6246
@@ -25,12 +25,12 @@ devflow_cli/commands/verify.py,sha256=GBFCfsN-xWyROCcngOANz-3ftNVeNZ4Y_JeWFo2muw
 devflow_cli/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devflow_cli/core/activity_base.py,sha256=YId_tUxiL6TYmnVpG2VYGkA31nPjIrskx6Dof27XR6E,16696
 devflow_cli/core/activity_contracts.py,sha256=ui-9JYwtZYcjEVppgcD5YNW_O7gkxxCkfXlIevLrJ-c,39295
-devflow_cli/core/adaptive_runner.py,sha256=BU3LZzM2f7dNvgKm_ul0CZYIs8z7WN1hM--TrF9o07s,48852
-devflow_cli/core/adaptive_workflow.py,sha256=F4uV5okQpFidZmneVZwW52XAO7gAmtuBAqBO9K9q7Uk,12173
+devflow_cli/core/adaptive_runner.py,sha256=ePnwJLPG2hpt76yE6WTTzXgljb7jkpVWAyTZRRdKVhs,48856
+devflow_cli/core/adaptive_workflow.py,sha256=CGfKOzCDwKGlp2ez9IDgBq6-FNjFYRhpJagZORpBGSc,14562
 devflow_cli/core/agent_failure.py,sha256=iX4q249lAHeVdD_ZF1aObmU-FX6sjfYP9dfLSnWGAD0,3771
 devflow_cli/core/agent_run_marker.py,sha256=QW3ScA2ZpqfQdUo5ANTbenDVyY2iHpB_wTaN6VUKlzc,3451
 devflow_cli/core/assessment.py,sha256=ACtJbXq1qZjVfeERjy8Qg6-ioLfSMUBVQm2l-mtGwgI,11522
-devflow_cli/core/automatic_evidence.py,sha256=m84Pa8DL4tO-Jzcvv6BNCX7g4zPbczFruGlg5Y2lrUs,42420
+devflow_cli/core/automatic_evidence.py,sha256=wBsOwQvwNSETefSMkZK6tcb3aDErgbVK9WANknT8HN4,42592
 devflow_cli/core/catalog.py,sha256=nLPc78JkbISaSxJnHlWiMi_lvepaumbfwcjgLuVy7Zc,3102
 devflow_cli/core/contract_schemas.py,sha256=TOGXwpNmm_MEzDkxR1wYvcCqASv1j4C1vxT6RjDFMiM,6744
 devflow_cli/core/docgen.py,sha256=47JoVDWetkcctgHwJZC67AVebOKgl10VB9hZ3Xr63mo,3908
@@ -41,7 +41,7 @@ devflow_cli/core/installer.py,sha256=fmfaJs5ApkhRmQi1B4vz52iAHBtqgeyBoAnE8CXAzJI
 devflow_cli/core/manifest.py,sha256=h058_m5-HJrYsNUdgfwnKts2riHiYPXUwMzPImHOs2g,7023
 devflow_cli/core/operational.py,sha256=11iLTbyZF0ZjYTQ5HDmVCaw4bpbXpLtH2v9f1WQOrYg,1228
 devflow_cli/core/redaction.py,sha256=o_1MDtCyvRLrk_dWlV6_7E6_mPVB1B5a0cCfTBj9j0Q,1973
-devflow_cli/core/remediation.py,sha256=AI5fBs-F8xF3uaxgYJDNJHKxJ7V5obEtnfptMm351AU,8426
+devflow_cli/core/remediation.py,sha256=gvoemlDDC6GmIwAu4BLWnrBTJ240Z6cFCjyxSVrX61c,9407
 devflow_cli/core/result_template.py,sha256=XfrjUlSUDYJxE2nN8EJjHCXq1l06hn-wW1gDn1c1rBA,2493
 devflow_cli/core/run_progress.py,sha256=hawaMo5sGcxvugexeryMWanFajdf46SY6b37O7dToZM,1855
 devflow_cli/core/runtime_backup.py,sha256=dowz6a1vcJsqkl-m9wGhS4F6XGfsU2rwSNJvIZMJjhI,4345
@@ -90,8 +90,8 @@ devflow_cli/resources/templates/contracts/api-template.md,sha256=rC5v7JBz71PznCn
 devflow_cli/resources/templates/contracts/components-template.md,sha256=XIWfEXfC72sNmL5OA3V-7xIywkNDU2DBPLfyiagOWcs,484
 devflow_cli/resources/templates/contracts/interfaces-template.md,sha256=kf8B7b6HsmN7jyRlLNU7RnZl0rTMlI5s97yVRyI-6yc,336
 devflow_cli/resources/templates/contracts/services-template.md,sha256=cFafKCyLmq_a7aR7G0LXAaMO2z4Fuflq6iKdxfVg0vg,477
-devflow_cli-8.5.0.dist-info/METADATA,sha256=pdYiU-6bFeQyZOYpdXA3GrR9Ha99afor2pZcjB9__oU,9982
-devflow_cli-8.5.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-devflow_cli-8.5.0.dist-info/entry_points.txt,sha256=GVJ6bMvFpqyO5589iC4nFKeGTpGIW8aKn_QPPpSZ6kU,48
-devflow_cli-8.5.0.dist-info/licenses/LICENSE,sha256=v79PvnmqOdKhQiOa_QcWxng4q8GuGscLOwi7ygUpwpo,1070
-devflow_cli-8.5.0.dist-info/RECORD,,
+devflow_cli-8.5.1.dist-info/METADATA,sha256=Vaqrf7U9UaMMnfl_sHbt_bK6B0WeyDBdaouxnd0E6Yo,9982
+devflow_cli-8.5.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+devflow_cli-8.5.1.dist-info/entry_points.txt,sha256=GVJ6bMvFpqyO5589iC4nFKeGTpGIW8aKn_QPPpSZ6kU,48
+devflow_cli-8.5.1.dist-info/licenses/LICENSE,sha256=v79PvnmqOdKhQiOa_QcWxng4q8GuGscLOwi7ygUpwpo,1070
+devflow_cli-8.5.1.dist-info/RECORD,,