Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions loopx/cli_runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,15 +914,24 @@ def _dispatch_selected(args: argparse.Namespace, raw_argv: list[str]) -> int:


def _standalone_core() -> bool:
from importlib.util import find_spec

if find_spec("loopx.cli") is not None:
return False
from importlib.metadata import PackageNotFoundError, distribution
from .python_install_owner import installed_loopx_distribution

# Do not discover the optional full CLI, even for selected-command help.
# Metadata must own this imported file, not a wheel shadowed by source.
try:
return installed_loopx_distribution(distribution).name == "loopx-core"
installed = installed_loopx_distribution(distribution)
if installed.name != "loopx-core":
return False
expected = Path(__file__).resolve()
for item in installed.files or ():
if not item.as_posix().endswith("loopx/cli_runtime.py"):
continue
record_path = Path(item.as_posix())
located = record_path if record_path.is_absolute() else Path(item.locate())
if located.resolve() == expected:
return True
return False
except PackageNotFoundError:
return False

Expand Down
8 changes: 5 additions & 3 deletions packages/loopx-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ uv pip install --python /tmp/loopx-core-env/bin/python /tmp/loopx-core-dist/loop
/tmp/loopx-core-env/bin/loopx doctor --installation-only --deep --format json
```

Python 3.11+ is required. Import and help do not need Node. Executing governed
tasks requires a qualified Node runtime (22.22.3+ and the existing SQLite
reliability checks), an explicitly selected host and its own prerequisites.
Python 3.11+ is required. Import and help do not need Node. Help selects the
installation from distribution metadata and its recorded module ownership,
without discovering the optional full CLI. Executing governed tasks requires a
qualified Node runtime (22.22.3+ and the existing SQLite reliability checks),
an explicitly selected host and its own prerequisites.
Use the existing `turn run-once --host generic-cli` entry, a separate validation
command, `turn inspect-journal` and `--resume-turn-key` for execution and recovery.
Start with one natural-language goal in your existing model host:
Expand Down
82 changes: 82 additions & 0 deletions tests/capabilities/test_performance_diagnosis_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ def run_cli(
(["performance-diagnosis", "inspect", "--profile", "missing.json"], 2),
(["--format", "invalid", "performance-diagnosis", "inspect", "--help"], 2),
(["--registry"], 2),
(["--cli-bin", "candidate cli", "performance-diagnosis", "--help"], 0),
(["--cli-bin=candidate cli", "performance-diagnosis", "plan", "--help"], 0),
(["--cli-bin"], 2),
# Top-level help precedes parsing even when it follows a value-taking option.
(["--cli-bin", "--help"], 0),
(["performance-diagnosis", "inspect", "--help", "--top", "invalid"], 0),
(["performance-diagnosis", "inspect", "--top", "invalid", "--help"], 2),
])
def test_parser_matches_full_cli(args: list[str], code: int) -> None:
full = run_cli("loopx.cli", args)
Expand Down Expand Up @@ -144,3 +151,78 @@ def audit(event, args):
)
assert result.returncode == 0, result.stderr
assert "usage:" in result.stdout


@pytest.mark.parametrize("installation", ["ordinary", "core", "foreign-core", "unrecorded-core", "missing"])
@pytest.mark.parametrize("route", [[], ["--cli-bin", "candidate cli"], ["--cli-bin=candidate cli"]])
@pytest.mark.parametrize("operation", ["help", "missing-facade", "broken-dependency"])
def test_installation_route_without_optional_discovery(
tmp_path: Path, installation: str, route: list[str], operation: str,
) -> None:
# Real metadata/RECORD parsing, with the installation boundary supplied by
# the fixture. A foreign core must not claim the imported source checkout.
script = f"""
import importlib.abc
import importlib.metadata as metadata
import json
from pathlib import Path
import sys
from loopx import cli_runtime
from loopx.command_invocation import loopx_cli_argv

installation = {installation!r}
operation = {operation!r}
name = 'loopx' if installation == 'ordinary' else 'loopx-core'
directory = Path({str(tmp_path)!r}) / 'fixture.dist-info'
directory.mkdir()
(directory / 'METADATA').write_text('Name: ' + name + '\\nVersion: 1.0\\n')
module = Path(cli_runtime.__file__).resolve()
if installation == 'foreign-core':
module = Path({str(tmp_path)!r}) / 'foreign' / 'loopx' / 'cli_runtime.py'
if installation != 'unrecorded-core':
(directory / 'RECORD').write_text(module.as_posix() + ',,\\n')
def distribution(requested):
if installation == 'missing' or requested != name:
raise metadata.PackageNotFoundError(requested)
return metadata.PathDistribution(directory)
metadata.distribution = distribution

class OptionalFacade(importlib.abc.MetaPathFinder):
def find_spec(self, fullname, path=None, target=None):
if fullname == 'loopx.cli':
if operation == 'help':
raise AssertionError('help discovered optional CLI')
missing = 'loopx.cli' if operation == 'missing-facade' else 'broken_inner_dependency'
raise ModuleNotFoundError('No module named ' + repr(missing), name=missing)
sys.meta_path.insert(0, OptionalFacade())
def audit(event, args):
if event in ('subprocess.Popen', 'os.system', 'os.posix_spawn', 'socket.connect', 'socket.getaddrinfo'):
raise AssertionError('routing attempted ' + event)
sys.addaudithook(audit)
route = {route!r}
with cli_runtime.cli_invocation_route(route):
print(json.dumps(loopx_cli_argv()), flush=True)
arguments = ['--help'] if operation == 'help' else ['dashboard']
raise SystemExit(cli_runtime.main([*route, *arguments]))
"""
result = subprocess.run(
[sys.executable, "-c", script], cwd=ROOT, capture_output=True, text=True, timeout=15,
env={**os.environ, "PATH": str(tmp_path / "no-executables"), "LOOPX_USAGE_PING": "0"},
)
expected_route = (
["candidate cli", "--cli-bin", "candidate cli"] if route else
[sys.executable, "-I", "-m", "loopx.entrypoint"] if installation == "core" else
["loopx"]
)
assert json.loads(result.stdout.splitlines()[0]) == expected_route, result.stderr
if operation == "help":
assert result.returncode == 0, result.stderr
elif operation == "missing-facade" and installation == "core":
assert result.returncode == 2
assert "unavailable in the standalone core" in result.stderr
assert "Traceback" not in result.stderr
else:
assert result.returncode == 1
missing = "loopx.cli" if operation == "missing-facade" else "broken_inner_dependency"
assert "ModuleNotFoundError: No module named " + repr(missing) in result.stderr
assert "unavailable in the standalone core" not in result.stderr
Loading