meridian-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meridian-cli
-Version: 0.3.0
+Version: 0.3.2
 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
@@ -24,7 +24,7 @@ Requires-Dist: coolname>=4.0.0
 Requires-Dist: cyclopts>=3.0
 Requires-Dist: fastapi>=0.115
 Requires-Dist: markdown-it-py>=4.0
-Requires-Dist: mars-agents==0.8.1
+Requires-Dist: mars-agents==0.8.3
 Requires-Dist: mcp>=1.0
 Requires-Dist: pathspec>=1.1.0
 Requires-Dist: psutil>=7.2.2
@@ -41,6 +41,7 @@ Requires-Dist: httpx>=0.28; extra == 'app'
 Provides-Extra: dev
 Requires-Dist: pyright>=1.1.400; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.24.0; extra == 'dev'
+Requires-Dist: pytest-timeout>=2.4.0; extra == 'dev'
 Requires-Dist: pytest>=8.4.0; extra == 'dev'
 Requires-Dist: ruff>=0.12.0; extra == 'dev'
 Provides-Extra: templates

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
   "cyclopts>=3.0",
   "fastapi>=0.115",
   "markdown-it-py>=4.0",
-  "mars-agents==0.8.1",
+  "mars-agents==0.8.3",
   "mcp>=1.0",
   "pathspec>=1.1.0",
   "psutil>=7.2.2",
@@ -56,6 +56,7 @@ dev = [
   "pyright>=1.1.400",
   "pytest>=8.4.0",
   "pytest-asyncio>=0.24.0",
+  "pytest-timeout>=2.4.0",
   "ruff>=0.12.0",
 ]
 templates = [
@@ -140,9 +141,11 @@ ignore = [
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
-addopts = "-ra -n auto"
+addopts = "-ra -n 4"
 asyncio_mode = "auto"
 pythonpath = ["src"]
+timeout = 60
+timeout_method = "thread"
 
 [dependency-groups]
 dev = [

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/agent_help.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 _SPAWN_SUPPLEMENT = (
     "Agent Notes:\n\n"
-    "Lifecycle: queued → running → finalizing → succeeded | failed | cancelled.\n"
+    "Lifecycle: queued → running → finalizing → succeeded | failed | cancelled | timed_out.\n"
     "'finalizing' is transient — treat as active when polling.\n\n"
     "Which subcommand when:\n\n"
     "  show ID        Status, report, cost — first check for any spawn\n\n"

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/bootstrap.py

@@ -35,6 +35,7 @@ _TOP_LEVEL_VALUE_FLAGS = frozenset(
         "--harness",
         "-a",
         "--work",
+        "--task-dir",
         "--autocompact",
         "--autocompact-pct",
         "--effort",
@@ -424,6 +425,19 @@ def maybe_bootstrap_runtime_state(
         return None
 
 
+@contextmanager
+def meridian_managed_env_default() -> Generator[None, None, None]:
+    prior = os.environ.get("MERIDIAN_MANAGED")
+    os.environ.setdefault("MERIDIAN_MANAGED", "1")
+    try:
+        yield
+    finally:
+        if prior is None:
+            os.environ.pop("MERIDIAN_MANAGED", None)
+        else:
+            os.environ["MERIDIAN_MANAGED"] = prior
+
+
 @contextmanager
 def temporary_config_env(config_file: str | None) -> Generator[None, None, None]:
     if config_file is None:

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/bootstrap_cmd.py

@@ -123,6 +123,7 @@ def register_bootstrap_command(
                 harness=global_harness or explicit_harness,
                 agent=agent,
                 work=work,
+                task_dir=None,
                 yolo=yolo,
                 approval=approval,
                 autocompact=autocompact,

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/entrypoint.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 
-from meridian.cli.bootstrap import first_positional_token
+from meridian.cli.bootstrap import first_positional_token, meridian_managed_env_default
 from meridian.cli.startup.catalog import COMMAND_CATALOG
 from meridian.cli.startup.classify import classify_invocation
 
@@ -38,6 +38,11 @@ def _is_version_request(argv: Sequence[str]) -> bool:
 def main() -> None:
     """Thin CLI entrypoint: handles trivial fast paths, delegates the rest."""
 
+    with meridian_managed_env_default():
+        _main_impl()
+
+
+def _main_impl() -> None:
     import sys
 
     if sys.platform == "win32":

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/main.py

@@ -42,6 +42,7 @@ from meridian.cli.bootstrap import (
 )
 from meridian.cli.bootstrap import (
     maybe_bootstrap_runtime_state,
+    meridian_managed_env_default,
     temporary_config_env,
 )
 from meridian.cli.bootstrap import (
@@ -418,6 +419,17 @@ def root(
         str,
         Parameter(name="--work", help="Attach the primary session to a work item id."),
     ] = "",
+    task_dir: Annotated[
+        str | None,
+        Parameter(
+            name="--task-dir",
+            help=(
+                "Override the source-code edit directory for this primary launch only. "
+                "Does not modify the work item's task_dir setting. "
+                "Relative -f paths resolve against this directory."
+            ),
+        ),
+    ] = None,
     yolo: Annotated[
         bool,
         Parameter(
@@ -496,29 +508,36 @@ def root(
             f"Conflicting harness selections: '{global_harness}' and '{explicit_harness}'."
         )
 
-    _run_primary_launch(
-        continue_ref=continue_ref,
-        fork_ref=fork_ref,
-        fork_fresh_ref=fork_fresh_ref,
-        from_ref=from_ref,
-        model=model,
-        harness=global_harness or explicit_harness,
-        agent=agent,
-        work=work,
-        yolo=yolo,
-        approval=approval,
-        autocompact=autocompact,
-        autocompact_pct=autocompact_pct,
-        effort=effort,
-        sandbox=sandbox,
-        timeout=timeout,
-        dry_run=dry_run,
-        reference_files=tuple(references),
-        prompt=resolved_prompt,
-        skills=tuple(parsed_skills),
-        goal=goal,
-        # See _split_passthrough_args() for why this reads from GlobalOptions.
-        passthrough=get_global_options().passthrough_args,
+    normalized_task_dir = (task_dir or "").strip() or None
+
+    from meridian.cli import primary_launch
+
+    emit(
+        primary_launch.run_primary_launch(
+            project_root=get_global_options().project_root,
+            continue_ref=continue_ref,
+            fork_ref=fork_ref,
+            fork_fresh_ref=fork_fresh_ref,
+            from_ref=from_ref,
+            model=model,
+            harness=global_harness or explicit_harness,
+            agent=agent,
+            work=work,
+            task_dir=normalized_task_dir,
+            yolo=yolo,
+            approval=approval,
+            autocompact=autocompact,
+            autocompact_pct=autocompact_pct,
+            effort=effort,
+            sandbox=sandbox,
+            timeout=timeout,
+            dry_run=dry_run,
+            passthrough=get_global_options().passthrough_args,
+            reference_files=tuple(references),
+            prompt=resolved_prompt,
+            skills=tuple(parsed_skills),
+            goal=goal,
+        )
     )
 
 
@@ -571,60 +590,6 @@ def mars(
     _run_mars_passthrough(args, output_format=get_global_options().output.format)
 
 
-def _run_primary_launch(
-    *,
-    continue_ref: str | None,
-    fork_ref: str | None,
-    fork_fresh_ref: str | None,
-    from_ref: str | None,
-    model: str,
-    harness: str | None,
-    agent: str | None,
-    work: str,
-    yolo: bool,
-    approval: str | None,
-    autocompact: int | None,
-    autocompact_pct: int | None,
-    effort: str | None,
-    sandbox: str | None,
-    timeout: float | None,
-    dry_run: bool,
-    reference_files: tuple[str, ...] = (),
-    prompt: str | None = None,
-    skills: tuple[str, ...] = (),
-    goal: str | None = None,
-    passthrough: tuple[str, ...] = (),
-) -> None:
-    from meridian.cli import primary_launch
-
-    emit(
-        primary_launch.run_primary_launch(
-            project_root=get_global_options().project_root,
-            continue_ref=continue_ref,
-            fork_ref=fork_ref,
-            fork_fresh_ref=fork_fresh_ref,
-            from_ref=from_ref,
-            model=model,
-            harness=harness,
-            agent=agent,
-            work=work,
-            yolo=yolo,
-            approval=approval,
-            autocompact=autocompact,
-            autocompact_pct=autocompact_pct,
-            effort=effort,
-            sandbox=sandbox,
-            timeout=timeout,
-            dry_run=dry_run,
-            passthrough=passthrough,
-            reference_files=reference_files,
-            prompt=prompt,
-            skills=skills,
-            goal=goal,
-        )
-    )
-
-
 @app.command(name="init")
 def init_alias(
     path: Annotated[
@@ -1070,6 +1035,11 @@ def _directory_env_scope(
 def main(argv: Sequence[str] | None = None) -> None:
     """CLI entry point used by `meridian` and `python -m meridian`."""
 
+    with meridian_managed_env_default():
+        _main_impl(argv=argv)
+
+
+def _main_impl(argv: Sequence[str] | None = None) -> None:
     from meridian.lib.core.logging import configure_logging
 
     args = list(sys.argv[1:] if argv is None else argv)

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/mars_passthrough.py

@@ -18,7 +18,6 @@ from meridian.lib.ops.mars import resolve_mars_executable
 class MarsPassthroughRequest:
     command: tuple[str, ...]
     mars_args: tuple[str, ...]
-    is_sync: bool
     wants_json: bool
     root_override: Path | None
 
@@ -53,25 +52,6 @@ def mars_requested_root(args: Sequence[str]) -> Path | None:
     return None
 
 
-def mars_subcommand(args: Sequence[str]) -> str | None:
-    index = 0
-    while index < len(args):
-        token = args[index]
-        if token == "--":
-            return None
-        if token == "--root":
-            index += 2
-            continue
-        if token.startswith("--root="):
-            index += 1
-            continue
-        if token.startswith("-"):
-            index += 1
-            continue
-        return token
-    return None
-
-
 def decode_json_values(raw_stdout: str) -> list[object] | None:
     decoder = json.JSONDecoder()
     parsed_values: list[object] = []
@@ -98,7 +78,6 @@ def parse_mars_passthrough(
     """Build an executable Mars passthrough request without side effects."""
 
     mars_args = list(args)
-    is_sync = mars_subcommand(mars_args) == "sync"
     wants_json = mars_requested_json(mars_args) or output_format == "json"
     if wants_json and not mars_requested_json(mars_args):
         mars_args = ["--json", *mars_args]
@@ -109,7 +88,6 @@ def parse_mars_passthrough(
     return MarsPassthroughRequest(
         command=(executable, *mars_args),
         mars_args=tuple(mars_args),
-        is_sync=is_sync,
         wants_json=wants_json,
         root_override=mars_requested_root(mars_args),
     )
@@ -124,11 +102,11 @@ def execute_mars_passthrough(
     """Execute a prepared Mars passthrough request."""
 
     stderr_stream = sys.stderr if stderr is None else stderr
-    run_kwargs: dict[str, object] = {}
-    if request.is_sync:
-        # With MERIDIAN_PROJECT_DIR set, parse_mars_passthrough injects --root to the
-        # launcher project; sync materializes .mars/ there, not the task cwd.
-        run_kwargs["env"] = {**os.environ, "MERIDIAN_MANAGED": "1"}
+    # With MERIDIAN_PROJECT_DIR set, parse_mars_passthrough injects --root to the
+    # launcher project; Mars runs under Meridian management for all passthrough commands.
+    run_kwargs: dict[str, object] = {
+        "env": {**os.environ, "MERIDIAN_MANAGED": os.environ.get("MERIDIAN_MANAGED", "1")},
+    }
     try:
         if request.wants_json:
             result = run(
@@ -196,4 +174,3 @@ def resolve_init_project_root(path: str | None) -> Path:
         return Path(path).expanduser().resolve()
     env_root = os.getenv("MERIDIAN_PROJECT_DIR", "").strip()
     return Path(env_root).expanduser().resolve() if env_root else Path.cwd().resolve()
-

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/primary_launch.py

@@ -146,6 +146,7 @@ def run_primary_launch(
     harness: str | None,
     agent: str | None,
     work: str,
+    task_dir: str | None = None,
     yolo: bool,
     approval: str | None,
     autocompact: int | None,
@@ -197,6 +198,11 @@ def run_primary_launch(
     fork_target_requested = raw_fork_target or None
     fork_fresh_target_requested = raw_fork_fresh_target or None
     context_from_requested = (raw_from_target,) if raw_from_target else ()
+    normalized_task_dir = (task_dir or "").strip() or None
+    if resume_target is not None and normalized_task_dir is not None:
+        raise ValueError(
+            "--continue does not accept --task-dir. Use --fork --task-dir to diverge."
+        )
     resolved_approval = approval if approval is not None else ("never" if yolo else "default")
 
     fork_resolution = validate_fork_mode(
@@ -349,6 +355,7 @@ def run_primary_launch(
             ),
             agent=requested_agent,
             work_id=requested_work_id,
+            task_dir=normalized_task_dir,
             passthrough_args=passthrough,
             session_mode=session_mode,
             pinned_context="",

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/spawn.py

@@ -37,6 +37,7 @@ from meridian.lib.ops.spawn.api import (
     SpawnForkInput,
     SpawnListInput,
     SpawnShowInput,
+    SpawnSignalInput,
     SpawnStatsInput,
     SpawnStatusInput,
     SpawnWaitInput,
@@ -46,9 +47,11 @@ from meridian.lib.ops.spawn.api import (
     spawn_children_sync,
     spawn_continue_sync,
     spawn_create_sync,
+    spawn_done_sync,
     spawn_files_sync,
     spawn_fork_sync,
     spawn_list_sync,
+    spawn_rearm_sync,
     spawn_show_sync,
     spawn_stats_sync,
     spawn_status_sync,
@@ -85,6 +88,20 @@ def _prepare_spawn_runtime_write() -> RuntimeWriteContext:
     return prepare_for_runtime_write(require_established_project_root())
 
 
+def _foreground_spawn_id_notifier(*, quiet: bool) -> Callable[[str], None] | None:
+    if quiet or _get_global_options().output.format == "json":
+        return None
+    sink = _current_output_sink()
+
+    def _notify(spawn_id: str) -> None:
+        sink.status(f"Spawn id: {spawn_id}")
+        from meridian.cli.output import flush_sink
+
+        flush_sink(sink)
+
+    return _notify
+
+
 def _spawn_create_exit_code(result: SpawnActionOutput) -> int:
     if result.exit_code is not None:
         return result.exit_code
@@ -558,6 +575,7 @@ def _spawn_create(
             ),
             sink=_current_output_sink(),
             prepared=_prepare_spawn_runtime_write(),
+            on_spawn_id=_foreground_spawn_id_notifier(quiet=quiet),
         )
     output_format = _get_global_options().output.format
     if output_format != "json" and metadata:
@@ -581,7 +599,10 @@ def _spawn_list(
         str | None,
         Parameter(
             name="--status",
-            help="Filter by status: queued, running, finalizing, succeeded, failed, cancelled.",
+            help=(
+                "Filter by status: queued, running, finalizing, succeeded, "
+                "failed, cancelled, timed_out."
+            ),
         ),
     ] = None,
     view: Annotated[
@@ -590,7 +611,7 @@ def _spawn_list(
             name="--view",
             help=(
                 "Preset list view: active, recent (recent active spawns), "
-                "all, running, queued, completed, failed, cancelled. "
+                "all, running, queued, completed, failed, cancelled, timed_out. "
                 "Default: active."
             ),
         ),
@@ -635,6 +656,7 @@ def _spawn_list(
         "completed": ("succeeded",),
         "failed": ("failed",),
         "cancelled": ("cancelled",),
+        "timed_out": ("timed_out",),
     }
     if normalized_view not in view_map:
         supported = ", ".join(view_map)
@@ -969,6 +991,42 @@ def _spawn_cancel_all(
         raise SystemExit(1)
 
 
+def _spawn_done(
+    emit: Any,
+    spawn_id: Annotated[
+        str | None,
+        Parameter(help="Spawn ID to finish (defaults to MERIDIAN_SPAWN_ID)."),
+    ] = None,
+) -> None:
+    result = spawn_done_sync(
+        SpawnSignalInput(spawn_id=spawn_id),
+        ctx=RuntimeContext.from_environment(),
+        sink=_current_output_sink(),
+        prepared=_prepare_spawn_runtime_write(),
+    )
+    emit(result)
+    if result.status == "failed":
+        raise SystemExit(1)
+
+
+def _spawn_rearm(
+    emit: Any,
+    spawn_id: Annotated[
+        str | None,
+        Parameter(help="Spawn ID to keep resident (defaults to MERIDIAN_SPAWN_ID)."),
+    ] = None,
+) -> None:
+    result = spawn_rearm_sync(
+        SpawnSignalInput(spawn_id=spawn_id),
+        ctx=RuntimeContext.from_environment(),
+        sink=_current_output_sink(),
+        prepared=_prepare_spawn_runtime_write(),
+    )
+    emit(result)
+    if result.status == "failed":
+        raise SystemExit(1)
+
+
 def _spawn_inject(
     spawn_id: Annotated[
         str,
@@ -1021,6 +1079,20 @@ def register_spawn_commands(app: App, emit: Emitter) -> tuple[set[str], dict[str
         emit=emit,
         default_handler=partial(_spawn_create, emit),
     )
+    app.command(
+        partial(_spawn_done, emit),
+        name="done",
+        help="Signal a resident spawn to finish successfully.",
+    )
+    registered.add("spawn.done")
+    descriptions["meridian.spawn.done"] = "Signal a resident spawn to finish successfully."
+    app.command(
+        partial(_spawn_rearm, emit),
+        name="rearm",
+        help="Signal a resident spawn to keep running.",
+    )
+    registered.add("spawn.rearm")
+    descriptions["meridian.spawn.rearm"] = "Signal a resident spawn to keep running."
     app.command(
         _spawn_inject,
         name="inject",

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/startup/help.py

@@ -27,6 +27,7 @@ Primary launch/resume:
   meridian --fork p123                  Fork from ref
   meridian --fork-fresh p123 -m MODEL   Fork and switch identity
   meridian --from p123                  Fresh session with prior context
+  meridian --task-dir PATH              Launch against a different edit directory
   continue/fork refs: chat id (c123), spawn id (p123), or raw harness session id
   --from refs: chat id (c123) or spawn id (p123)
   --fork preserves agent/model/skills identity. --fork-fresh allows
@@ -155,6 +156,8 @@ Primary launch/resume:
 
   meridian --from p123
 
+  meridian --task-dir PATH
+
   continue/fork refs: chat id (c123), spawn id (p123), or raw harness session id
   --from refs: chat id (c123) or spawn id (p123)
   --fork preserves agent/model/skills identity. --fork-fresh allows

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/cli/utils.py

@@ -98,7 +98,6 @@ def missing_fork_session_error_with_discovery(
         return missing_fork_session_error(normalized_ref)
 
     from meridian.lib.ops.runtime import resolve_runtime_root_for_read
-    from meridian.lib.state import spawn_store
     from meridian.lib.state.primary_meta import read_primary_harness_session_discovery
 
     runtime_root = resolve_runtime_root_for_read(project_root)
@@ -111,7 +110,13 @@ def missing_fork_session_error_with_discovery(
             else (source_chat_id or "").strip()
         )
         if chat_ref:
-            chat_spawns = spawn_store.list_spawns(runtime_root, filters={"chat_id": chat_ref})
+            from meridian.lib.state import session_identity
+
+            owner_chat_id = session_identity.get_owner_chat_for_session(runtime_root, chat_ref)
+            lookup_chat_id = owner_chat_id or chat_ref
+            chat_spawns = session_identity.list_spawns_for_owner_chat(
+                runtime_root, lookup_chat_id
+            )
             pi_primary_spawns = [
                 row for row in chat_spawns if row.kind == "primary" and row.harness == "pi"
             ]

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/lib/config/settings.py

@@ -1337,6 +1337,30 @@ class MeridianConfig(BaseSettings):
             env_vars=("MERIDIAN_PI_CHILD_WAVE_TIMEOUT_SECONDS",),
         ),
     ] = None
+    resident_deadline_seconds: Annotated[
+        float | None,
+        config_field(
+            "timeouts.resident_deadline_seconds",
+            value_kind="float",
+            file_aliases=(
+                file_alias("timeouts", "resident_deadline_seconds"),
+                file_alias(None, "resident_deadline_seconds"),
+            ),
+            env_vars=("MERIDIAN_RESIDENT_DEADLINE_SECONDS",),
+        ),
+    ] = None
+    resident_poll_seconds: Annotated[
+        float | None,
+        config_field(
+            "timeouts.resident_poll_seconds",
+            value_kind="float",
+            file_aliases=(
+                file_alias("timeouts", "resident_poll_seconds"),
+                file_alias(None, "resident_poll_seconds"),
+            ),
+            env_vars=("MERIDIAN_RESIDENT_POLL_SECONDS",),
+        ),
+    ] = None
     pi_task_ping_interval_seconds: Annotated[
         float | None,
         config_field(

{meridian_cli-0.3.0 → meridian_cli-0.3.2}/src/meridian/lib/core/domain.py

@@ -11,7 +11,9 @@ from meridian.lib.core.types import (
 )
 from meridian.lib.core.util import FormatContext
 
-SpawnStatus = Literal["queued", "running", "finalizing", "succeeded", "failed", "cancelled"]
+SpawnStatus = Literal[
+    "queued", "running", "finalizing", "succeeded", "failed", "cancelled", "timed_out"
+]
 
 
 class TokenUsage(BaseModel):