meridian-cli 0.3.44__tar.gz → 0.3.45__tar.gz

{meridian_cli-0.3.44 → meridian_cli-0.3.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meridian-cli
-Version: 0.3.44
+Version: 0.3.45
 Summary: Orchestrate CLI + MCP server for multi-model agent workflows
 Project-URL: Homepage, https://github.com/haowjy/meridian-cli
 Project-URL: Repository, https://github.com/haowjy/meridian-cli

{meridian_cli-0.3.44 → meridian_cli-0.3.45}/src/meridian/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.3.44"
+__version__ = "0.3.45"

{meridian_cli-0.3.44 → meridian_cli-0.3.45}/src/meridian/lib/harness/.context/CONTEXT.md

@@ -160,7 +160,9 @@ qualify by `event.harness_id`.
 
 Key mappings:
 - Claude: `result` event with `is_error=True` → failed; `subtype in ("", "success")` and `terminal_reason in ("", "completed")` → succeeded
-- Codex: main-thread `turn/completed` → succeeded; `meridian/error/connectionClosed` → failed
+- Codex: main-thread `turn/completed` resolves nested `turn.status` — `completed`/absent
+  → succeeded/0, `failed` → failed/1 with upstream error, `interrupted` → cancelled/130,
+  unknown → failed/1 diagnostic; `meridian/error/connectionClosed` → failed
 - OpenCode: parent-session `session.idle` → succeeded; parent-session `session.error` → failed
 - Cursor: `meridian/error/connectionClosed` → failed; no explicit success event — stdout EOF
   + process exit code 0 is the success boundary (see `CursorSubprocessConnection.events()`).

{meridian_cli-0.3.44 → meridian_cli-0.3.45}/src/meridian/lib/harness/codex.py

@@ -70,6 +70,7 @@ from meridian.lib.harness.semantics import (
     TerminalEventOutcome,
     TerminalOutcomeCause,
     connection_closed_outcome,
+    stringify_terminal_error,
 )
 from meridian.lib.launch.composition import (
     ComposedLaunchContent,
@@ -537,7 +538,38 @@ def _resolve_codex_terminal(event: RawHarnessEvent) -> TerminalEventOutcome | No
             event,
             cause=TerminalOutcomeCause.REPLACEABLE_TRANSPORT_CLOSE,
         )
-    return None
+    if event.event_type != "turn/completed":
+        return None
+
+    turn = event.payload.get("turn")
+    turn_payload = cast("dict[str, object]", turn) if isinstance(turn, dict) else None
+    turn_status = turn_payload.get("status") if turn_payload is not None else None
+    if turn_payload is None or turn_status == "completed":
+        return TerminalEventOutcome(status=SpawnStatus.SUCCEEDED, exit_code=0)
+    if turn_status == "failed":
+        assert turn_payload is not None
+        error: object = turn_payload.get("error")
+        error_payload = cast("dict[str, object]", error) if isinstance(error, dict) else None
+        preferred_error = error_payload.get("message") if error_payload is not None else None
+        return TerminalEventOutcome(
+            status=SpawnStatus.FAILED,
+            exit_code=1,
+            error=stringify_terminal_error(preferred_error)
+            or stringify_terminal_error(cast("object", error)),
+        )
+    if turn_status == "interrupted":
+        return TerminalEventOutcome(
+            status=SpawnStatus.CANCELLED,
+            exit_code=130,
+            error="interrupted",
+        )
+    # A status-less turn is malformed. Fail loudly: false failures are visible;
+    # hidden failures are not. A missing turn remains success for older payloads.
+    return TerminalEventOutcome(
+        status=SpawnStatus.FAILED,
+        exit_code=1,
+        error=f"unexpected_codex_turn_status:{turn_status}",
+    )
 
 
 CODEX_SEMANTICS = HarnessSemantics(
@@ -550,7 +582,10 @@ CODEX_SEMANTICS = HarnessSemantics(
         ),
         MERIDIAN_CONNECTION_CLOSED_EVENT: EventSemantics(),
     },
-    payload_resolvers={MERIDIAN_CONNECTION_CLOSED_EVENT: _resolve_codex_terminal},
+    payload_resolvers={
+        "turn/completed": _resolve_codex_terminal,
+        MERIDIAN_CONNECTION_CLOSED_EVENT: _resolve_codex_terminal,
+    },
     scoped_events=frozenset({"turn/started", "turn/completed"}),
     scope_id_resolver=extract_codex_thread_id,
 )

{meridian_cli-0.3.44 → meridian_cli-0.3.45}/src/meridian/lib/harness/semantics.py

@@ -33,6 +33,12 @@ class TerminalEventOutcome:
     error: str | None = None
     cause: TerminalOutcomeCause | None = None
 
+    def __post_init__(self) -> None:
+        if self.status == SpawnStatus.SUCCEEDED and (
+            self.exit_code != 0 or self.error is not None
+        ):
+            raise ValueError("succeeded terminal outcomes require exit_code=0 and no error")
+
 
 @dataclass(frozen=True)
 class PrimaryEventScope:

{meridian_cli-0.3.44 → meridian_cli-0.3.45}/src/meridian/lib/launch/context.py

@@ -635,6 +635,41 @@ def _resolve_deny_headless_harnesses(
     return tuple(load_config(project_paths.project_root).deny_headless_harnesses)
 
 
+def _enforce_headless_harness_policy(
+    *,
+    request: SpawnRequest,
+    harness: SubprocessHarness,
+    runtime: LaunchRuntime,
+    project_paths: ProjectConfigPaths,
+) -> None:
+    """Reject denied headless harnesses before a spawn can be persisted."""
+
+    if (
+        runtime.composition_surface != LaunchCompositionSurface.SPAWN_PREPARE
+        or harness.id.value not in _resolve_deny_headless_harnesses(runtime, project_paths)
+    ):
+        return
+
+    parent_harness = os.getenv("_MERIDIAN_HARNESS", "")
+    if parent_harness == harness.id.value:
+        agent_hint = (
+            f' Use your native Agent(subagent_type="{request.agent}") tool'
+            " to delegate instead."
+            if request.agent
+            else " Use your native Agent() tool to delegate instead."
+        )
+    else:
+        agent_hint = (
+            " Use a different model with '-m <model>' to route to an allowed harness,"
+            " or override with '--harness <harness>'."
+        )
+    raise ValueError(
+        f"Headless spawns on the '{harness.id.value}' harness are denied by "
+        f"'[spawn] deny_headless_harnesses' in meridian.toml."
+        f"{agent_hint}"
+    )
+
+
 def _missing_continue_session_error(source_ref: str | None) -> str:
     normalized_source = (source_ref or "").strip()
     if normalized_source:
@@ -1592,6 +1627,12 @@ def prepare_launch_surface(
             )
         }
     )
+    _enforce_headless_harness_policy(
+        request=resolved_request,
+        harness=harness,
+        runtime=runtime,
+        project_paths=project_paths,
+    )
     return PreparedLaunchSurface(
         request=resolved_request,
         harness=harness,
@@ -1877,30 +1918,13 @@ def bind_launch_context(
         if tools != resolved_request.tools:
             resolved_request = resolved_request.model_copy(update={"tools": tools})
 
-    if (
-        runtime.composition_surface == LaunchCompositionSurface.SPAWN_PREPARE
-        and harness.id.value in _resolve_deny_headless_harnesses(runtime, project_paths)
-    ):
-        parent_harness = os.getenv("_MERIDIAN_HARNESS", "")
-        if parent_harness == harness.id.value:
-            # Caller is on the same harness that's denied — suggest native delegation.
-            agent_hint = (
-                f' Use your native Agent(subagent_type="{resolved_request.agent}") tool'
-                " to delegate instead."
-                if resolved_request.agent
-                else " Use your native Agent() tool to delegate instead."
-            )
-        else:
-            # Caller is on a different harness — suggest switching model/harness.
-            agent_hint = (
-                " Use a different model with '-m <model>' to route to an allowed harness,"
-                " or override with '--harness <harness>'."
-            )
-        raise ValueError(
-            f"Headless spawns on the '{harness.id.value}' harness are denied by "
-            f"'[spawn] deny_headless_harnesses' in meridian.toml."
-            f"{agent_hint}"
-        )
+    # Defense in depth for persisted worker requests that bypassed preparation.
+    _enforce_headless_harness_policy(
+        request=resolved_request,
+        harness=harness,
+        runtime=runtime,
+        project_paths=project_paths,
+    )
 
     is_primary_launch = runtime.composition_surface == LaunchCompositionSurface.PRIMARY
     inject_task_cwd_instruction = directory_context.should_inject_task_cwd_instruction(