freesolo-flash-dev 0.2.29__tar.gz → 0.2.30__tar.gz

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/.github/workflows/bake-kernel-cache.yml

@@ -11,8 +11,8 @@ name: flash worker kernel-cache (per-arch)
 # warmup runs INSIDE it so the cache matches the image's pinned torch/triton/fla/liger toolchain.
 #
 # Secrets: RUNPOD_API_KEY (the warmup GPU pod) + HF_TOKEN (the temp dataset that ferries code + the
-# cache artifact) are pulled from Infisical (/flash, prod) via the bootstrap INFISICAL_CLIENT_ID /
-# CLIENT_SECRET / PROJECT_ID repo secrets; the GHCR push uses the default GITHUB_TOKEN. Heavy + paid,
+# cache artifact) are native repo Actions secrets, synced from Infisical (prod:/flash-ci) by the
+# github-ci-flash Secret Sync; the GHCR push uses the default GITHUB_TOKEN. Heavy + paid,
 # but UNGATED: the fingerprint detection in auto-rebake.yml decides WHEN this runs (only on a real
 # kernel-toolchain change), so there is no manual approval step. Invoked by hand (workflow_dispatch)
 # OR automatically by auto-rebake.yml (workflow_call) when the kernel toolchain changed.
@@ -179,38 +179,25 @@ jobs:
         if: steps.gate.outputs.run == 'true'
         run: uv sync --extra server
 
-      - name: Install Infisical CLI
-        if: steps.gate.outputs.run == 'true'
-        run: |
-          curl -1sLf 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.deb.sh' | sudo -E bash
-          sudo apt-get update && sudo apt-get install -y infisical
-
-      # RUNPOD_API_KEY + HF_TOKEN come from Infisical (/flash, prod) -- mirrors infisical-entrypoint.sh;
-      # the CLI takes the project UUID directly (the secrets-action wants a slug). `env -u
-      # FLASH_CHALK_SPEC` drops any chalk-spec override living in /flash so the bake always warms the
-      # repo-default chalk (the value the fingerprint hashed) -- otherwise the image could be warmed with
-      # one chalk and labeled with another. BASE_IMAGE is digest-pinned so the warm runs inside the EXACT
-      # base the per-arch tag will sit on.
+      # RUNPOD_API_KEY (the warmup GPU pod) + HF_TOKEN (the temp dataset that ferries code/cache) are
+      # native repo Actions secrets, synced from Infisical (prod:/flash-ci) by the github-ci-flash
+      # Secret Sync. No Infisical CLI/login at job time -- Infisical stays the source of truth and
+      # rotations propagate via the sync. FLASH_CHALK_SPEC isn't synced, so bake_kernel_cache.py uses
+      # the repo-default DEFAULT_CHALK_SPEC (the value the fingerprint hashed) automatically. BASE_IMAGE
+      # is digest-pinned so the warm runs inside the EXACT base the per-arch tag will sit on.
       - name: Warm kernels on a RunPod ${{ matrix.sm }} GPU -> build/kernel_cache
         if: steps.gate.outputs.run == 'true'
         env:
-          INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
-          INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
-          INFISICAL_PROJECT_ID: ${{ secrets.INFISICAL_PROJECT_ID }}
+          RUNPOD_API_KEY: ${{ secrets.RUNPOD_API_KEY }}
+          HF_TOKEN: ${{ secrets.HF_TOKEN }}
           BASE_IMAGE: ${{ steps.base.outputs.ref }}
         run: |
-          INFISICAL_TOKEN="$(infisical login --method=universal-auth \
-            --client-id="$INFISICAL_CLIENT_ID" --client-secret="$INFISICAL_CLIENT_SECRET" \
-            --silent --plain)"
-          export INFISICAL_TOKEN
-          infisical run --projectId "$INFISICAL_PROJECT_ID" --env prod --path /flash -- \
-            env -u FLASH_CHALK_SPEC \
-            uv run python docker/bake_kernel_cache.py \
-              --arch "${{ matrix.arch }}" --sm "${{ matrix.sm }}" \
-              --gpu-type-id "${{ matrix.gpu_type_id }}" \
-              --allowed-cuda "${{ matrix.allowed_cuda }}" \
-              --image "$BASE_IMAGE" \
-              --out build/kernel_cache
+          uv run python docker/bake_kernel_cache.py \
+            --arch "${{ matrix.arch }}" --sm "${{ matrix.sm }}" \
+            --gpu-type-id "${{ matrix.gpu_type_id }}" \
+            --allowed-cuda "${{ matrix.allowed_cuda }}" \
+            --image "$BASE_IMAGE" \
+            --out build/kernel_cache
 
       - name: Free disk space
         if: steps.gate.outputs.run == 'true'

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freesolo-flash-dev
-Version: 0.2.29
+Version: 0.2.30
 Summary: Flash — managed LoRA post-training (SFT/GRPO) for Freesolo environments, driven by the `flash` CLI
 Project-URL: Homepage, https://github.com/freesolo-co/flash
 Project-URL: Repository, https://github.com/freesolo-co/flash

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/flash/cli/__init__.py

@@ -72,7 +72,11 @@ _HELP_GROUPS: list[tuple[str, list[tuple[str, str]]]] = [
     (
         "environments",
         [
-            ("env", "manage Freesolo environments"),
+            ("env setup", "scaffold a starter Freesolo environment"),
+            ("env list", "list local environment sources"),
+            ("env push", "upload a local environment"),
+            ("env pull", "download a published environment or file"),
+            ("env delete", "delete a published environment"),
         ],
     ),
     (
@@ -160,7 +164,9 @@ class _FlashParser(_ThemedParser):
             return super().format_help()
         usage = f"{CLI_NAME} [--debug] [-v] <command> [args]"
         footers = [
-            f"new here? run `{CLI_NAME} login`, then `{CLI_NAME} train configs/rl.toml`",
+            f"new here? run `{CLI_NAME} login`, then `{CLI_NAME} env setup`",
+            f"train after publishing: `{CLI_NAME} env push --name my-env .`, "
+            f"then `{CLI_NAME} train configs/rl.toml`",
             f"any command in depth: `{CLI_NAME} <command> --help`",
             "docs: https://freesolo.co/docs",
         ]

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/flash/server/auth.py

@@ -85,6 +85,8 @@ def _identity_from_verify_body(raw: bytes) -> dict[str, Any]:
             or _str_field(user.get("id"))
         ),
         "org_id": _str_field(body.get("org_id")) or _str_field(org.get("id")),
+        "org_slug": _str_field(body.get("org_slug")) or _str_field(org.get("slug")),
+        "org_name": _str_field(body.get("org_name")) or _str_field(org.get("name")),
         "api_key_id": (
             _str_field(body.get("api_key_id"))
             or _str_field(body.get("key_id"))
@@ -124,7 +126,15 @@ def _external_row(row: dict, token: str, identity: dict[str, Any]) -> dict:
     out["key_prefix"] = _external_key_prefix(token, identity)
     if identity.get("email"):
         out["email"] = identity["email"]
-    for key in ("user_id", "org_id", "api_key_id", "training_agent_job_id", "project_id"):
+    for key in (
+        "user_id",
+        "org_id",
+        "org_slug",
+        "org_name",
+        "api_key_id",
+        "training_agent_job_id",
+        "project_id",
+    ):
         if identity.get(key):
             out[key] = identity[key]
     return out
@@ -184,13 +194,13 @@ def authenticate(authorization: str | None) -> dict | None:
         return out
     if _freesolo_verify(token):
         identity = _cached_identity(token)
-        email = _identity_email(identity)
-        if not email:
+        if not identity.get("org_slug"):
             return None
+        email = _identity_email(identity)
         row = db.lookup_key(token) or db.ensure_external_key(
             token,
             key_prefix=_external_key_prefix(token, identity),
-            email=email,
+            email=email or None,
         )
         return _external_row(row, token, identity) if row is not None else None
     return None

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/flash/server/envs.py

@@ -23,18 +23,17 @@ _DEFAULT_GITHUB_REPO = "freesolo-co/environment-hub"
 _GITHUB_BRANCH = "main"
 _DEFAULT_ENVIRONMENT_FILE = "environment.py"
 # Genuine repo-control directories that live at the ROOT of the environment-hub checkout. A DELETE
-# runs `git rm -r -- <namespace>/<name>` directly against that checkout, so a slug whose namespace is
+# runs `git rm -r -- <org-slug>/<name>` directly against that checkout, so a slug whose namespace is
 # one of these would target tracked repo infrastructure (e.g. `DELETE /v1/envs/.github/workflows`).
-# `namespace_for` slugifies an email and can NEVER emit a dot-prefixed namespace, so these are never
-# publishable namespaces and are always safe to reject on delete.
+# Org slugs can never be dot-prefixed, so these are never publishable namespaces and are always safe
+# to reject on delete.
 _REPO_CONTROL_TOP_LEVEL_PATHS = {
     ".github",
     ".git",
 }
 # Top-level segments barred from env-package CONTENTS by `_safe_extract`. A strict SUPERSET of the
 # repo-control set: it also bars a top-level `source/` dir inside a package. `source` is intentionally
-# NOT a repo-control namespace — `namespace_for` can slugify a user email to the `source` namespace
-# and publish writes `source/<name>` without objection — so the delete validator must reject only
+# NOT a repo-control namespace, so the delete validator must reject only
 # `_REPO_CONTROL_TOP_LEVEL_PATHS`, not this set, or `source/<name>` envs become undeletable.
 _BLOCKED_TOP_LEVEL_PATHS = _REPO_CONTROL_TOP_LEVEL_PATHS | {"source"}
 _TAR_METADATA_TYPES = {
@@ -57,21 +56,18 @@ class EnvPublishError(Exception):
         self.status = status
 
 
-# Internal service key has no per-user email; fixed namespace keeps it stable.
-_INTERNAL_NAMESPACE = "internal-freesolo-co"
-
-
 def namespace_for(key: dict) -> str:
-    if key.get("auth_kind") == "internal":
-        return _INTERNAL_NAMESPACE
-    email = str(key.get("email") or "")
-    if "@" not in email:
+    org = key.get("org") if isinstance(key.get("org"), dict) else {}
+    raw = key.get("org_slug") or org.get("slug")
+    slug = str(raw or "").strip()
+    if not slug:
         raise EnvPublishError(
-            "authenticated Freesolo key must include an email (used to derive the hub namespace) — "
+            "authenticated Freesolo key must include an org slug (used to derive the hub namespace) — "
             "publish with a key created at https://freesolo.co/sign-in (`flash login`)"
         )
-    slug = re.sub(r"[^a-z0-9]+", "-", email.lower()).strip("-")
-    return slug or "user"
+    if not re.fullmatch(r"[a-z0-9][a-z0-9._-]*", slug):
+        raise EnvPublishError("authenticated Freesolo key has an invalid org slug")
+    return slug
 
 
 def _sanitize_name(name: str) -> str:
@@ -458,9 +454,8 @@ def _validate_slug(slug: str) -> tuple[str, str]:
     # An internal-key delete bypasses the namespace-ownership check in delete_package, so this
     # validator is the only barrier, and a request like `DELETE /v1/envs/.github/workflows` would
     # otherwise remove tracked repo infrastructure. Reject ONLY `_REPO_CONTROL_TOP_LEVEL_PATHS`, NOT
-    # the wider publish-content blocklist: `source` is a legitimately publishable namespace
-    # (`namespace_for` can slugify an email to it and publish writes `source/<name>` without
-    # objection), so blocking it here would leave those envs publishable-but-undeletable.
+    # the wider publish-content blocklist: `source` is a legitimately publishable org slug, so
+    # blocking it here would leave those envs publishable-but-undeletable.
     if namespace in _REPO_CONTROL_TOP_LEVEL_PATHS:
         raise EnvPublishError(f"invalid env id segment: {namespace!r}")
     return namespace, name
@@ -587,13 +582,13 @@ def delete_package(*, slug: str, key: dict) -> bool:
 
     Returns ``True`` when a package was removed and ``False`` when it was already absent
     (idempotent). Authorization mirrors publish's namespace isolation: a user key may delete
-    only environments in its own ``namespace_for(key)`` namespace, while the internal service
-    key (``auth_kind == "internal"``) may delete any environment.
+    only environments in its own org-slug namespace, while the internal service key
+    (``auth_kind == "internal"``) may delete any environment.
     """
     namespace, name = _validate_slug(slug)
     canonical = f"{namespace}/{name}"
-    caller_namespace = namespace_for(key)
-    if key.get("auth_kind") != "internal" and namespace != caller_namespace:
+    caller_namespace = None if key.get("auth_kind") == "internal" else namespace_for(key)
+    if caller_namespace is not None and namespace != caller_namespace:
         raise EnvPublishError(
             "you can only delete environments in your own namespace "
             f"({caller_namespace}/…); got {canonical!r}",

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/flash/server/routes/meta.py

@@ -28,6 +28,8 @@ def me(key: Annotated[dict, Depends(require_key)]):
         "email",
         "user_id",
         "org_id",
+        "org_slug",
+        "org_name",
         "api_key_id",
         "training_agent_job_id",
         "project_id",

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "freesolo-flash-dev"
-version = "0.2.29"
+version = "0.2.30"
 description = "Flash — managed LoRA post-training (SFT/GRPO) for Freesolo environments, driven by the `flash` CLI"
 readme = "README.md"
 # RunPod Flash supports Python 3.11-3.12 (not 3.13 yet).
@@ -109,7 +109,7 @@ artifacts = ["flash/py.typed"]
 # auto-published by .github/workflows/publish-dev.yml: a push to `dev` whose version isn't yet on
 # PyPI publishes it; pushes that don't change it find it already published and no-op. So cutting a
 # dev-channel release = bump this (and [project].version) and merge to `dev`.
-version = "0.2.29"
+version = "0.2.30"
 
 [tool.pytest.ini_options]
 pythonpath = ["."]

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/tests/test_billing_retry.py

@@ -591,7 +591,12 @@ def _identity_for_token(token: str) -> dict[str, str]:
     if not token.startswith(_USER_PREFIX):
         return {}
     suffix = token.removeprefix(_USER_PREFIX)
-    return {"email": f"u-{suffix}@x", "key_prefix": "fslo_test", "org_id": f"org-{suffix}"}
+    return {
+        "email": f"u-{suffix}@x",
+        "key_prefix": "fslo_test",
+        "org_id": f"org-{suffix}",
+        "org_slug": f"org-{suffix}",
+    }
 
 
 def test_startup_runs_completion_charge_sweep(monkeypatch, tmp_path):

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/tests/test_cli_help.py

@@ -21,11 +21,34 @@ def _registered_subcommands() -> set[str]:
     return set(sub.choices)
 
 
+def _registered_env_subcommands() -> set[str]:
+    """The nested environment commands argparse registers under `flash env`."""
+    parser = cli._build_parser()
+    sub = next(a for a in parser._actions if isinstance(a, argparse._SubParsersAction))
+    env_parser = sub.choices["env"]
+    env_sub = next(a for a in env_parser._actions if isinstance(a, argparse._SubParsersAction))
+    return {f"env {name}" for name in env_sub.choices}
+
+
 def _catalog_commands() -> set[str]:
-    """The commands listed in the themed help grid (_HELP_GROUPS)."""
+    """The root commands represented by the themed help grid (_HELP_GROUPS).
+
+    Rows may show nested commands such as `env push`, but argparse only registers `env`
+    at the root level.
+    """
+    return {cmd.split()[0] for _, rows in cli._HELP_GROUPS for cmd, _ in rows}
+
+
+def _catalog_rows() -> set[str]:
+    """The display rows listed in the themed help grid (_HELP_GROUPS)."""
     return {cmd for _, rows in cli._HELP_GROUPS for cmd, _ in rows}
 
 
+def _catalog_env_rows() -> set[str]:
+    """The nested environment rows listed in the themed help grid."""
+    return {cmd for cmd in _catalog_rows() if cmd.startswith("env ")}
+
+
 def test_help_catalog_matches_registered_subcommands() -> None:
     """Every real subcommand appears once in the themed help, and the help lists no command that
     isn't real — so the grouped `flash --help` can't drift from the actual CLI surface."""
@@ -41,6 +64,10 @@ def test_help_catalog_matches_registered_subcommands() -> None:
     assert len(flat) == len(set(flat)), "a command is listed under more than one help group"
 
 
+def test_help_catalog_matches_registered_env_subcommands() -> None:
+    assert _catalog_env_rows() == _registered_env_subcommands()
+
+
 def test_help_styled_is_themed_and_exits_zero(monkeypatch, capsys) -> None:
     monkeypatch.setenv("FLASH_STYLE", "1")
     monkeypatch.setenv("NO_COLOR", "1")  # layout kept, color dropped — assert on contiguous text
@@ -53,8 +80,10 @@ def test_help_styled_is_themed_and_exits_zero(monkeypatch, capsys) -> None:
     assert "managed LoRA post-training" in out  # themed banner (lowercase) vs argparse description
     for title in ("getting started", "catalog", "environments", "training", "serving & export"):
         assert title in out  # grouped, not a flat dump
-    for cmd in _catalog_commands():
+    for cmd in _catalog_rows():
         assert cmd in out
+    assert f"{cli.CLI_NAME} env setup" in out
+    assert f"{cli.CLI_NAME} env push --name my-env ." in out
     assert "usage:" in out
     assert f"{cli.CLI_NAME} <command> --help" in out  # next-step hint
 

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/tests/test_client.py

@@ -186,11 +186,11 @@ def test_publish_env_plain_without_progress(stub):
 def test_delete_env_sends_delete_to_slug_path(stub):
     url, seen = stub
     client = ApiClient(url, "fslo-user-test")
-    out = client.delete_env("dev-clado-ai/my-env")
-    assert out == {"id": "dev-clado-ai/my-env", "deleted": True}
+    out = client.delete_env("acme/my-env")
+    assert out == {"id": "acme/my-env", "deleted": True}
     assert seen["method"] == "DELETE"
     # the namespace/name slug (with its slash) goes straight into the path
-    assert seen["path"] == "/v1/envs/dev-clado-ai/my-env"
+    assert seen["path"] == "/v1/envs/acme/my-env"
     assert seen["auth"] == "Bearer fslo-user-test"
 
 

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/tests/test_client_server_integration.py

@@ -63,6 +63,7 @@ def _identity_for_token(token: str) -> dict[str, str]:
         "email": f"user-{suffix}@example.com",
         "key_prefix": "fslo_test",
         "org_id": f"org-{suffix}",
+        "org_slug": f"org-{suffix}",
     }
 
 
@@ -176,6 +177,7 @@ def test_health_and_identity_roundtrip(make_client) -> None:
     # the JSON body back into a dict the CLI prints.
     assert me["key_prefix"]
     assert "email" in me
+    assert "org_slug" in me
 
 
 def test_create_status_list_cancel_lifecycle(make_client) -> None:

{freesolo_flash_dev-0.2.29 → freesolo_flash_dev-0.2.30}/tests/test_env_publish.py

@@ -73,34 +73,31 @@ def _pkg_b64(files: dict[str, str]) -> str:
     return base64.b64encode(buf.getvalue()).decode()
 
 
-def test_namespace_is_stable_and_repo_safe():
-    assert envs.namespace_for({"email": "Dev@Clado.ai"}) == "dev-clado-ai"
-    assert envs.namespace_for({"email": "dev@clado.ai"}) == "dev-clado-ai"
-
-
-def test_namespace_requires_email():
-    for key in ({"id": 7}, {"key_prefix": "fslo-abc"}, {}, {"email": "missing-email"}):
-        with pytest.raises(envs.EnvPublishError, match="email"):
+def test_namespace_uses_org_slug():
+    assert envs.namespace_for({"org_slug": "acme"}) == "acme"
+    assert envs.namespace_for({"org": {"slug": "freesolo-co"}}) == "freesolo-co"
+    assert envs.namespace_for({"email": "dev@clado.ai", "org_slug": "acme"}) == "acme"
+
+
+def test_namespace_requires_org_slug():
+    for key in (
+        {"id": 7},
+        {"key_prefix": "fslo-abc"},
+        {},
+        {"email": "dev@clado.ai"},
+        {"org_name": "Acme"},
+        {"org_slug": "Bad Slug"},
+    ):
+        with pytest.raises(envs.EnvPublishError, match="org slug"):
             envs.namespace_for(key)
 
 
-def test_internal_key_gets_reserved_namespace_without_email():
-    # The internal/operator service key has a synthetic/shared identity (no per-user email) but is
-    # trusted to submit runs and read everything, so it must be able to publish too. It gets a
-    # fixed reserved namespace instead of raising — regardless of whether its row carries an email.
-    assert envs.namespace_for({"auth_kind": "internal"}) == envs._INTERNAL_NAMESPACE
-    assert envs.namespace_for({"auth_kind": "internal", "email": ""}) == envs._INTERNAL_NAMESPACE
-    assert (
-        envs.namespace_for({"auth_kind": "internal", "email": "missing-email"})
-        == envs._INTERNAL_NAMESPACE
-    )
-
-
-def test_internal_special_case_does_not_loosen_user_keys():
-    # The bypass is reserved for auth_kind == "internal" ONLY: a user key (any other auth_kind, or
-    # none) without a valid email must still be rejected so two users can't collide on a namespace.
-    for key in ({"auth_kind": "external"}, {"auth_kind": "user", "email": "no-at"}, {"email": ""}):
-        with pytest.raises(envs.EnvPublishError, match="email"):
+def test_internal_key_does_not_get_publish_namespace_fallback():
+    for key in (
+        {"auth_kind": "internal"},
+        {"auth_kind": "internal", "email": "internal@freesolo.co"},
+    ):
+        with pytest.raises(envs.EnvPublishError, match="org slug"):
             envs.namespace_for(key)
 
 
@@ -130,15 +127,15 @@ def test_publish_uploads_to_github_and_returns_slug(monkeypatch):
     ref = envs.publish_package(
         package_b64=_pkg_b64(_MINIMAL),
         name="My Env!",
-        key={"email": "dev@clado.ai"},
+        key={"email": "dev@clado.ai", "org_slug": "acme"},
     )
 
-    root = "dev-clado-ai/my-env"
+    root = "acme/my-env"
     assert ref == root
     assert captured["repo"] == "freesolo-co/environment-hub"
     assert captured["token"] == "ghp-test"
     assert captured["publish_root"] == root
-    assert captured["message"] == "Upload Flash environment dev-clado-ai/my-env"
+    assert captured["message"] == "Upload Flash environment acme/my-env"
     assert captured["files"] == ["environment.py", "pyproject.toml"]
 
 
@@ -155,7 +152,7 @@ def test_publish_rejects_bad_input(monkeypatch):
         envs.publish_package(
             package_b64=_pkg_b64({"pyproject.toml": "[project]\nname='e'\n"}),
             name="e",
-            key={"email": "dev@clado.ai"},
+            key={"org_slug": "acme"},
         )
 
 
@@ -201,7 +198,7 @@ def test_record_published_environment_posts_to_backend(monkeypatch):
     monkeypatch.setattr(environment_registry.urllib.request, "urlopen", fake_urlopen)
 
     ok = environment_registry.record_published_environment(
-        slug="dev-clado-ai/my-env",
+        slug="acme/my-env",
         name="My Env",
         key={"org_id": "org-1", "user_id": "user-1", "api_key_id": "key-1"},
     )
@@ -212,11 +209,11 @@ def test_record_published_environment_posts_to_backend(monkeypatch):
     body = json.loads(seen["body"])
     assert body == {
         "orgId": "org-1",
-        "slug": "dev-clado-ai/my-env",
+        "slug": "acme/my-env",
         "name": "My Env",
         "hubRepo": "freesolo-co/environment-hub",
         "hubRef": "main",
-        "hubPath": "dev-clado-ai/my-env/environment.py",
+        "hubPath": "acme/my-env/environment.py",
         "publishedByUserId": "user-1",
         "apiKeyId": "key-1",
         "metadata": {"source": "flash.env.push"},
@@ -229,7 +226,7 @@ def test_record_published_environment_is_best_effort(monkeypatch):
     monkeypatch.delenv("FREESOLO_INTERNAL_KEY", raising=False)
     assert (
         environment_registry.record_published_environment(
-            slug="dev-clado-ai/my-env",
+            slug="acme/my-env",
             name="My Env",
             key={"org_id": "org-1"},
         )
@@ -262,7 +259,7 @@ def test_record_environment_use_posts_to_backend(monkeypatch):
     monkeypatch.setattr(environment_registry.urllib.request, "urlopen", fake_urlopen)
 
     ok = environment_registry.record_environment_use(
-        slug="dev-clado-ai/my-env",
+        slug="acme/my-env",
         run_id="flash-1",
         key={"org_id": "org-1"},
     )
@@ -272,7 +269,7 @@ def test_record_environment_use_posts_to_backend(monkeypatch):
     assert seen["headers"]["Authorization"] == "Bearer internal-test"
     assert json.loads(seen["body"]) == {
         "orgId": "org-1",
-        "slug": "dev-clado-ai/my-env",
+        "slug": "acme/my-env",
         "runId": "flash-1",
     }
 
@@ -310,7 +307,7 @@ def test_record_training_run_posts_to_backend(monkeypatch):
                 "model": "Qwen/Qwen3.5-4B",
                 "algorithm": "grpo",
                 "phase": "rl",
-                "environment": {"id": "dev-clado-ai/my-env"},
+                "environment": {"id": "acme/my-env"},
                 "gpu": {"type": "RTX 5090"},
             },
             platform_context={
@@ -328,7 +325,7 @@ def test_record_training_run_posts_to_backend(monkeypatch):
     assert body["orgId"] == "org-1"
     assert body["runId"] == "flash-1"
     assert body["status"] == "running"
-    assert body["environmentSlug"] == "dev-clado-ai/my-env"
+    assert body["environmentSlug"] == "acme/my-env"
     assert body["model"] == "Qwen/Qwen3.5-4B"
 
 
@@ -571,10 +568,10 @@ def test_github_publish_retries_concurrent_push(monkeypatch, tmp_path):
     monkeypatch.setattr(envs, "_github_publish_once", fake_publish_once)
     monkeypatch.setattr(envs.time, "sleep", lambda _seconds: None)
 
-    ref = envs._github_publish(tmp_path, name="e", key={"email": "dev@clado.ai"})
+    ref = envs._github_publish(tmp_path, name="e", key={"org_slug": "acme"})
 
     assert calls["count"] == 2
-    assert ref == "dev-clado-ai/e"
+    assert ref == "acme/e"
 
 
 def _git(cwd: Path, *args: str) -> None:
@@ -631,9 +628,9 @@ def test_delete_package_user_can_delete_own_namespace(monkeypatch):
 
     monkeypatch.setattr(envs, "_github_delete", fake_github_delete)
     assert (
-        envs.delete_package(slug="dev-clado-ai/my-env", key={"email": "dev@clado.ai"}) is True
+        envs.delete_package(slug="acme/my-env", key={"org_slug": "acme"}) is True
     )
-    assert seen == {"slug": "dev-clado-ai/my-env", "token": "ghp-test"}
+    assert seen == {"slug": "acme/my-env", "token": "ghp-test"}
 
 
 def test_delete_package_rejects_other_users_namespace(monkeypatch):
@@ -642,7 +639,7 @@ def test_delete_package_rejects_other_users_namespace(monkeypatch):
         envs, "_github_delete", lambda *a, **k: pytest.fail("storage must not be touched")
     )
     with pytest.raises(envs.EnvPublishError) as excinfo:
-        envs.delete_package(slug="someone-else/env", key={"email": "dev@clado.ai"})
+        envs.delete_package(slug="someone-else/env", key={"org_slug": "acme"})
     assert excinfo.value.status == 403
 
 
@@ -652,18 +649,16 @@ def test_delete_package_internal_key_can_delete_any_namespace(monkeypatch):
     monkeypatch.setattr(
         envs, "_github_delete", lambda slug, *, token: seen.update(slug=slug) or True
     )
-    assert (
-        envs.delete_package(slug="dev-clado-ai/paper-foo", key={"auth_kind": "internal"}) is True
-    )
-    assert seen["slug"] == "dev-clado-ai/paper-foo"
+    assert envs.delete_package(slug="acme/paper-foo", key={"auth_kind": "internal"}) is True
+    assert seen["slug"] == "acme/paper-foo"
 
 
 def test_delete_package_internal_key_rejects_repo_control_namespace(monkeypatch):
     # The internal key bypasses the namespace-ownership check, so _validate_slug is the ONLY barrier
     # before `git rm -r -- <namespace>/<name>`. A GENUINE repo-control top-level path (a dir at the
     # root of the hub checkout) must be rejected so e.g. DELETE /v1/envs/.github/workflows can't
-    # remove tracked repo infrastructure. Only `.git`/`.github` qualify — `namespace_for` can never
-    # slugify an email to a dot-prefixed namespace, so these are never publishable.
+    # remove tracked repo infrastructure. Only `.git`/`.github` qualify because org slugs can never
+    # be dot-prefixed, so these are never publishable.
     monkeypatch.setenv("GITHUB_TOKEN", "ghp-test")
     monkeypatch.setattr(
         envs, "_github_delete", lambda *a, **k: pytest.fail("storage must not be touched")
@@ -677,10 +672,9 @@ def test_delete_package_internal_key_rejects_repo_control_namespace(monkeypatch)
 
 def test_delete_package_allows_publishable_source_namespace(monkeypatch):
     # Regression guard for publish/delete symmetry: `source` is in publish's package-CONTENT
-    # blocklist (_BLOCKED_TOP_LEVEL_PATHS via _safe_extract) but is a legitimate user NAMESPACE —
-    # `namespace_for` slugifies an email like `source@` to `source` and publish writes `source/<name>`
-    # without objection. Delete must therefore reach storage for `source/<name>` (not 400), or those
-    # envs would be publishable-but-undeletable.
+    # blocklist (_BLOCKED_TOP_LEVEL_PATHS via _safe_extract) but is a legitimate org namespace.
+    # Delete must therefore reach storage for `source/<name>` (not 400), or those envs would be
+    # publishable-but-undeletable.
     monkeypatch.setenv("GITHUB_TOKEN", "ghp-test")
     seen: dict[str, str] = {}
 
@@ -689,8 +683,8 @@ def test_delete_package_allows_publishable_source_namespace(monkeypatch):
         return True
 
     monkeypatch.setattr(envs, "_github_delete", fake_delete)
-    # A user key whose email normalizes to the `source` namespace deletes its OWN `source/<name>`.
-    source_key = {"email": "source@"}
+    # A user key whose org slug is `source` deletes its OWN `source/<name>`.
+    source_key = {"org_slug": "source"}
     assert envs.namespace_for(source_key) == "source"
     assert "source" in envs._BLOCKED_TOP_LEVEL_PATHS  # still barred from package CONTENTS
     assert envs.delete_package(slug="source/my-env", key=source_key) is True
@@ -718,7 +712,7 @@ def test_delete_package_validates_slug(monkeypatch):
 
 
 def test_canonical_env_id_accepts_only_canonical_form():
-    assert envs.canonical_env_id("dev-clado-ai/my-env") == "dev-clado-ai/my-env"
+    assert envs.canonical_env_id("acme/my-env") == "acme/my-env"
     for bad in ("ns/env/", " ns/env", "ns/env ", "ns/env%20", "Ns/Env", "noslash"):
         with pytest.raises(envs.EnvPublishError):
             envs.canonical_env_id(bad)
@@ -727,7 +721,7 @@ def test_canonical_env_id_accepts_only_canonical_form():
 def test_delete_package_requires_github_token(monkeypatch):
     monkeypatch.delenv("GITHUB_TOKEN", raising=False)
     with pytest.raises(envs.EnvPublishError) as excinfo:
-        envs.delete_package(slug="internal-freesolo-co/x", key={"auth_kind": "internal"})
+        envs.delete_package(slug="acme/x", key={"auth_kind": "internal"})
     assert excinfo.value.status == 503
     assert "GITHUB_TOKEN" in str(excinfo.value)
 
@@ -908,7 +902,7 @@ def test_record_deleted_environment_sends_delete(monkeypatch):
     monkeypatch.setattr(environment_registry.urllib.request, "urlopen", fake_urlopen)
 
     ok = environment_registry.record_deleted_environment(
-        slug="dev-clado-ai/my-env",
+        slug="acme/my-env",
         key={"org_id": "org-1"},
     )
 
@@ -916,7 +910,7 @@ def test_record_deleted_environment_sends_delete(monkeypatch):
     assert seen["url"] == "https://backend.test/api/flash/environments/internal"
     assert seen["method"] == "DELETE"
     assert seen["headers"]["Authorization"] == "Bearer internal-test"
-    assert json.loads(seen["body"]) == {"orgId": "org-1", "slug": "dev-clado-ai/my-env"}
+    assert json.loads(seen["body"]) == {"orgId": "org-1", "slug": "acme/my-env"}
 
 
 def test_record_deleted_environment_is_best_effort(monkeypatch):
@@ -925,7 +919,7 @@ def test_record_deleted_environment_is_best_effort(monkeypatch):
     monkeypatch.delenv("FREESOLO_INTERNAL_KEY", raising=False)
     assert (
         environment_registry.record_deleted_environment(
-            slug="dev-clado-ai/my-env",
+            slug="acme/my-env",
             key={"org_id": "org-1"},
         )
         is False