diff --git a/openadapt/cli.py b/openadapt/cli.py index 3901bedd7..7f179ef90 100644 --- a/openadapt/cli.py +++ b/openadapt/cli.py @@ -295,7 +295,7 @@ def _python_fix() -> str: installer = " curl -LsSf https://astral.sh/uv/install.sh | sh\n" script = ( "\nOr use the installer script: https://raw.githubusercontent.com/" - "OpenAdaptAI/openadapt-flow/main/scripts/install.sh" + "OpenAdaptAI/OpenAdapt/main/packages/flow/scripts/install.sh" ) return ( "Install OpenAdapt with uv, which downloads Python 3.12 if you don't " diff --git a/packages/flow/openadapt_flow/__main__.py b/packages/flow/openadapt_flow/__main__.py index 3baf2e40e..2a43374bc 100644 --- a/packages/flow/openadapt_flow/__main__.py +++ b/packages/flow/openadapt_flow/__main__.py @@ -6469,12 +6469,12 @@ def _package_version() -> str: covers only the environment the workflow was qualified in. Definitions of qualify and certify: - docs/QUALIFICATION_TERMS.md + https://docs.openadapt.ai/reference/glossary/#qualify Certification policies (built-in clinical-write and permissive, or your own YAML file passed to --certify): - docs/QUALIFICATION_TERMS.md#certification-policy + https://docs.openadapt.ai/reference/glossary/#certification-policy How to write verify.yaml: - docs/QUALIFY_A_WORKFLOW.md + https://github.com/OpenAdaptAI/OpenAdapt/blob/main/packages/flow/docs/QUALIFY_A_WORKFLOW.md """ @@ -7932,7 +7932,8 @@ def build_parser() -> argparse.ArgumentParser: metavar="POLICY", help=( "Certify under this policy (default: campaign.policy in verify.yaml, " - "usually clinical-write). See docs/QUALIFICATION_TERMS.md#policies." + "usually clinical-write). See " + "https://docs.openadapt.ai/reference/glossary/#certification-policy." ), ) q.add_argument( diff --git a/packages/flow/openadapt_flow/agent/copy.py b/packages/flow/openadapt_flow/agent/copy.py index 8e2ffc999..93dcfb7b6 100644 --- a/packages/flow/openadapt_flow/agent/copy.py +++ b/packages/flow/openadapt_flow/agent/copy.py @@ -31,10 +31,14 @@ #: The first command once this version is on PyPI: the zero-flag sandbox. FIRST_COMMAND = "claude mcp add openadapt -- uvx --python 3.12 openadapt-agent serve" -#: The same command from the GitHub source, for use before the release. +#: The same command from the monorepo source, for use before the release. +#: Flow comes from source too, because the agent code now lives in it. PREVIEW_COMMAND = ( - "claude mcp add openadapt -- uvx --python 3.12 --from " - "git+https://github.com/OpenAdaptAI/openadapt-agent openadapt-agent serve" + "claude mcp add openadapt -- uvx --python 3.12 --with " + "'openadapt-flow @ git+https://github.com/OpenAdaptAI/OpenAdapt" + "#subdirectory=packages/flow' --from " + "'git+https://github.com/OpenAdaptAI/OpenAdapt#subdirectory=packages/agent' " + "openadapt-agent serve" ) #: Older name for ``FIRST_COMMAND``. THREE_LINE_INSTALL = FIRST_COMMAND diff --git a/packages/flow/openadapt_flow/registry.py b/packages/flow/openadapt_flow/registry.py index 44b7ec581..dfbd11571 100644 --- a/packages/flow/openadapt_flow/registry.py +++ b/packages/flow/openadapt_flow/registry.py @@ -26,7 +26,10 @@ from typing import Any, Optional from urllib.parse import urljoin -DEFAULT_INDEX_URL = "https://raw.githubusercontent.com/OpenAdaptAI/openadapt-flow/main/registry/index.json" +DEFAULT_INDEX_URL = ( + "https://raw.githubusercontent.com/OpenAdaptAI/OpenAdapt/main/" + "packages/flow/registry/index.json" +) STATUSES = ("example", "certified", "planned") MAX_FILE_BYTES = 20 * 1024 * 1024 diff --git a/packages/flow/scripts/install.sh b/packages/flow/scripts/install.sh index 0864cb249..d0ed2943a 100755 --- a/packages/flow/scripts/install.sh +++ b/packages/flow/scripts/install.sh @@ -1,7 +1,7 @@ #!/bin/sh -# OpenAdapt installer (browser quickstart) — https://github.com/OpenAdaptAI/openadapt-flow +# OpenAdapt installer (browser quickstart) — https://github.com/OpenAdaptAI/OpenAdapt # -# curl -fsSL https://raw.githubusercontent.com/OpenAdaptAI/openadapt-flow/main/scripts/install.sh | sh +# curl -fsSL https://raw.githubusercontent.com/OpenAdaptAI/OpenAdapt/main/packages/flow/scripts/install.sh | sh # # Installs uv (a fast Python toolchain) if you don't have it, provisions # Python 3.12 (downloading a managed interpreter only if no suitable system diff --git a/packages/flow/tests/test_qualify_declarative.py b/packages/flow/tests/test_qualify_declarative.py index b5c13c533..1fe3dd4da 100644 --- a/packages/flow/tests/test_qualify_declarative.py +++ b/packages/flow/tests/test_qualify_declarative.py @@ -248,7 +248,7 @@ def test_qualify_help_opens_with_the_definition(): check=True, ).stdout assert out.splitlines()[0] == QUALIFY_DEFINITION - assert "QUALIFICATION_TERMS.md" in out + assert "https://docs.openadapt.ai/reference/glossary/#qualify" in out def test_cli_reports_config_errors(tmp_path): diff --git a/tests/test_cli_quickstart_polish.py b/tests/test_cli_quickstart_polish.py index 52cba9d38..57242d702 100644 --- a/tests/test_cli_quickstart_polish.py +++ b/tests/test_cli_quickstart_polish.py @@ -78,8 +78,8 @@ def test_unsupported_python_preflight_prints_remedy_before_delegation( assert f"This is Python {version_info[0]}.{version_info[1]}" in result.output assert "uv tool install --python 3.12 openadapt" in result.output assert ( - "https://raw.githubusercontent.com/OpenAdaptAI/openadapt-flow/" - "main/scripts/install.sh" in result.output + "https://raw.githubusercontent.com/OpenAdaptAI/OpenAdapt/" + "main/packages/flow/scripts/install.sh" in result.output ) assert engine_calls == []