devflow-cli 4.0.2__py3-none-any.whl → 6.0.0__py3-none-any.whl

devflow_cli/__init__.py

@@ -1,6 +1,6 @@
 """devflow CLI — workflow de développement adaptatif."""
 
-VERSION = "4.0.2"
+VERSION = "6.0.0"
 
 SUPPORTED_AGENTS = ["claude-code", "codex", "cursor"]
 
@@ -42,7 +42,7 @@ ARTIFACTS = [
     "preflight-evidence.md",
     "worklog.md",
     "activity-contract.json",
-    "activity-result.json",
+    "implement-result.json",
     "verification.json",
 ]
 

devflow_cli/adapters/agents.py

@@ -21,6 +21,7 @@ SandboxMode = Literal["read-only", "workspace-write"]
 _SAFE_DIAGNOSTIC_MESSAGES = {
     "final-output-empty": "--output-last-message est vide",
     "final-output-absent": "--output-last-message est absent",
+    "agent-turn-failed": "le tour agent a echoue avant la reponse finale",
 }
 
 
@@ -85,6 +86,7 @@ class AgentAdapter(ABC):
                 timeout=timeout,
                 text=True,
                 capture_output=capture_output,
+                stdin=subprocess.DEVNULL,
                 shell=False,
             )
             return AgentExecution(
@@ -123,6 +125,7 @@ class AgentAdapter(ABC):
                 timeout=timeout,
                 text=True,
                 capture_output=True,
+                stdin=subprocess.DEVNULL,
                 shell=False,
             )
             execution = AgentExecution(
@@ -133,7 +136,7 @@ class AgentAdapter(ABC):
                 final_output_status=_output_status(output_file),
                 final_output_bytes=_output_size(output_file),
                 final_output_diagnostic="process-failed" if result.returncode else "validating",
-                session_id=_session_id(result.stdout or "", result.stderr or ""),
+                session_id=self.session_id(result.stdout or "", result.stderr or ""),
             )
             if execution.returncode != 0:
                 return execution
@@ -200,8 +203,16 @@ class AgentAdapter(ABC):
         except FileNotFoundError:
             return AgentExecution(127, stderr=f"Executable '{self.executable}' introuvable", duration_seconds=time.monotonic() - started)
 
-    def _structured_payload(self, stdout: str, output_file: Path) -> object:
-        if output_file.is_file():
+    def session_id(self, stdout: str, stderr: str) -> str | None:
+        """Extrait un identifiant opaque de session, sans conserver la sortie."""
+        return _session_id(stdout, stderr)
+
+    def recover_structured_payload(self, raw_output: str) -> object:
+        """Extrait la reponse structuree d'une trace brute conservee apres un echec."""
+        return self._structured_payload(raw_output, None)
+
+    def _structured_payload(self, stdout: str, output_file: Path | None) -> object:
+        if output_file is not None and output_file.is_file():
             return json.loads(output_file.read_text(encoding="utf-8"))
         return json.loads(stdout)
 
@@ -245,16 +256,19 @@ class ClaudeCodeAdapter(AgentAdapter):
             prompt,
         ]
 
-    def _structured_payload(self, stdout: str, output_file: Path) -> object:
+    def _structured_payload(self, stdout: str, output_file: Path | None) -> object:
         del output_file
         envelope = json.loads(stdout)
         if not isinstance(envelope, dict):
             raise ValueError("enveloppe JSON Claude absente")
         if envelope.get("subtype") not in {None, "success"}:
             raise ValueError(f"execution Claude terminee avec {envelope.get('subtype')}")
-        if "structured_output" not in envelope:
-            raise ValueError("champ structured_output absent")
-        return envelope["structured_output"]
+        if "structured_output" in envelope:
+            return envelope["structured_output"]
+        result = envelope.get("result")
+        if isinstance(result, str) and result.strip():
+            return json.loads(_strip_json_fence(result))
+        raise ValueError("champ structured_output absent")
 
 
 class CodexAdapter(AgentAdapter):
@@ -284,6 +298,7 @@ class CodexAdapter(AgentAdapter):
         else:
             command.extend(["--sandbox", sandbox_mode])
         command.extend([
+            "--json",
             "--output-schema",
             str(schema_file),
             "--output-last-message",
@@ -292,20 +307,36 @@ class CodexAdapter(AgentAdapter):
         command.append(prompt)
         return command
 
-    def _structured_payload(self, stdout: str, output_file: Path) -> object:
-        """Lit la reponse finale Codex et distingue son absence d'un JSON invalide."""
-        if output_file.is_file():
+    def session_id(self, stdout: str, stderr: str) -> str | None:
+        """Prefere l'identifiant de fil annonce par le flux d'evenements."""
+        for event in json_line_events(stdout):
+            if event.get("type") == "thread.started" and isinstance(
+                event.get("thread_id"), str
+            ):
+                return event["thread_id"]
+        return _session_id(stdout, stderr)
+
+    def _structured_payload(self, stdout: str, output_file: Path | None) -> object:
+        """Lit la reponse finale Codex, sinon la recupere depuis le flux d'evenements."""
+        if output_file is not None and output_file.is_file():
             payload = output_file.read_text(encoding="utf-8")
             if payload.strip():
                 return json.loads(payload)
+            diagnostic = "final-output-empty"
+            message = "Codex a termine sans reponse finale structuree"
+        else:
+            diagnostic = "final-output-absent"
+            message = "Codex n'a pas produit le fichier de reponse finale structuree"
+        events = json_line_events(stdout)
+        if any(event.get("type") == "turn.failed" for event in events):
             raise StructuredOutputError(
-                "final-output-empty",
-                "Codex a termine sans reponse finale structuree",
+                "agent-turn-failed",
+                "Codex a interrompu son tour avant la reponse finale",
             )
-        raise StructuredOutputError(
-            "final-output-absent",
-            "Codex n'a pas produit le fichier de reponse finale structuree",
-        )
+        final_message = _codex_final_message(events)
+        if final_message is not None:
+            return json.loads(_strip_json_fence(final_message))
+        raise StructuredOutputError(diagnostic, message)
 
 
 class CursorAdapter(AgentAdapter):
@@ -341,7 +372,7 @@ class CursorAdapter(AgentAdapter):
         command.append(structured_prompt)
         return command
 
-    def _structured_payload(self, stdout: str, output_file: Path) -> object:
+    def _structured_payload(self, stdout: str, output_file: Path | None) -> object:
         del output_file
         envelope = json.loads(stdout)
         if not isinstance(envelope, dict):
@@ -423,6 +454,33 @@ def _session_id(stdout: str, stderr: str) -> str | None:
     return match.group(1) if match else None
 
 
+def json_line_events(stdout: str) -> list[dict]:
+    """Decode un flux JSONL d'agent en ignorant les lignes non JSON ou non objet."""
+    events: list[dict] = []
+    for line in stdout.splitlines():
+        line = line.strip()
+        if not line.startswith("{"):
+            continue
+        try:
+            event = json.loads(line)
+        except json.JSONDecodeError:
+            continue
+        if isinstance(event, dict):
+            events.append(event)
+    return events
+
+
+def _codex_final_message(events: list[dict]) -> str | None:
+    """Retourne le dernier message d'agent complet du flux d'evenements."""
+    for event in reversed(events):
+        item = event.get("item")
+        if event.get("type") != "item.completed" or not isinstance(item, dict):
+            continue
+        if item.get("type") == "agent_message" and isinstance(item.get("text"), str):
+            return item["text"]
+    return None
+
+
 def _strip_json_fence(value: str) -> str:
     text = value.strip()
     match = re.fullmatch(r"```(?:json)?\s*([\s\S]*?)\s*```", text, re.IGNORECASE)

devflow_cli/cli.py

@@ -13,7 +13,6 @@ from devflow_cli.commands.feature import feature
 from devflow_cli.commands.context import context
 from devflow_cli.commands.export_cmd import export
 from devflow_cli.commands.stale import stale
-from devflow_cli.commands.migrate_cmd import migrate
 from devflow_cli.commands.upgrade_cmd import upgrade
 from devflow_cli.commands import extension
 from devflow_cli.commands import hooks_cmd
@@ -53,7 +52,6 @@ app.command()(feature)
 app.command()(context)
 app.command(name="export")(export)
 app.command()(stale)
-app.command()(migrate)
 app.command()(upgrade)
 app.add_typer(extension.app, name="extension")
 app.add_typer(hooks_cmd.app, name="hooks")