Real setup steps instead of a download that never existed; mobile notice, veil and control fixes

APPLY2.bat

@@ -0,0 +1,14 @@
+cd /d "%~dp0"
+@echo off
+(
+echo ===== APPLY 2 =====
+powershell -NoProfile -Command "Expand-Archive -LiteralPath distinct-update2.zip -DestinationPath . -Force"
+echo EXPAND_EXIT=%ERRORLEVEL%
+git add -A
+git -c user.name=User1342 -c user.email=User1342@users.noreply.huggingface.co commit -m "Real setup steps instead of a download that never existed; mobile notice, veil and control fixes"
+echo COMMIT_EXIT=%ERRORLEVEL%
+git push origin main
+echo PUSH_EXIT=%ERRORLEVEL%
+git log --oneline -1
+del /q distinct-update2.zip
+) >> push-log8.txt 2>&1

distinct_server/presentation.py

@@ -406,19 +406,29 @@ footer,.gradio-container footer{display:none !important;}
    was the loudest colour on it. */
 .c-notice{background:var(--c-surface); border:1px solid var(--c-hairline);
           border-radius:var(--r-md); padding:var(--s3) var(--s4);}
-.c-notice__summary{display:flex; align-items:baseline; gap:var(--s3);
+/* The mark belongs to the sentence, so it must never be able to wrap away
+   from it. On a phone the row wrapped into three lines and left a bare "!"
+   floating above the text like a rendering fault. The mark and the sentence
+   are now one non-breaking pair that shrinks together; only the "What is
+   kept" toggle is allowed to drop to its own line. */
+.c-notice__summary{display:flex; align-items:flex-start; gap:var(--s3);
                    flex-wrap:wrap; cursor:pointer; list-style:none;
                    font-size:var(--t-label); color:var(--c-text-2);
                    line-height:1.5;}
+.c-notice__summary>span:nth-child(2){flex:1 1 180px; min-width:0;}
 .c-notice__summary::-webkit-details-marker{display:none;}
 .c-notice__summary strong{color:var(--c-text); font-weight:600;}
 .c-notice__mark{flex:none; width:16px; height:16px; border-radius:50%;
-                align-self:center;
+                margin-top:2px;
                 border:1.5px solid var(--c-warn-rule); color:var(--c-warn-rule);
                 font-size:10px; font-weight:700; display:grid; place-items:center;}
 .c-notice__toggle{margin-left:auto; white-space:nowrap; font-size:var(--t-micro);
                   color:var(--c-muted); text-decoration:underline;
                   text-underline-offset:2px; padding-left:var(--s3);}
+@media (max-width:700px){
+  /* Its own line, aligned with the sentence it opens rather than the mark. */
+  .c-notice__toggle{flex:1 0 100%; margin:var(--s2) 0 0 28px; padding-left:0;}
+}
 .c-notice__body{margin:var(--s3) 0 var(--s1) 28px; font-size:var(--t-micro);
                 line-height:1.6; color:var(--c-text-2); max-width:var(--measure);}
 .c-notice__summary:focus-visible{outline:3px solid var(--c-sage); outline-offset:3px;
@@ -1290,6 +1300,29 @@ details[open] .c-libhelp__toggle::after{content:" -";}
              border-radius:var(--r-md); padding:var(--s3); font-family:var(--mono);
              font-size:11.5px; line-height:1.6; overflow-x:auto; white-space:pre;
              color:var(--c-text-2); user-select:all;}
+.c-join__note{margin:0; font-size:var(--t-micro); color:var(--c-muted);
+              line-height:1.55; max-width:56ch;}
+.c-join__note code{font-family:var(--mono); font-size:11px;
+                   background:var(--c-fill); border-radius:4px; padding:1px 5px;}
+.c-join__note .c-join__code{display:inline-block; padding:2px 8px;
+                            font-size:11.5px; margin-top:4px;}
+
+/* SETTING UP A WORKER, AS NUMBERED STEPS.
+   Three things happen in order and each can fail on its own, so each is
+   drawn as its own step with its own command. Told as one paragraph, a
+   volunteer who got half way could not tell which half they were in. */
+.c-steps-num{list-style:none; margin:0; padding:0; display:flex;
+             flex-direction:column; gap:var(--s5);}
+.c-step-num{display:flex; gap:var(--s3); align-items:flex-start;}
+.c-step-num__n{flex:none; width:24px; height:24px; border-radius:50%;
+               display:grid; place-items:center; margin-top:1px;
+               background:var(--c-mint); color:var(--c-sage-deep);
+               font-size:12px; font-weight:700;}
+.c-step-num__body{flex:1 1 auto; min-width:0; display:flex;
+                  flex-direction:column; gap:var(--s2);}
+.c-step-num__head{margin:0; font-size:var(--t-body); font-weight:650;
+                  color:var(--c-text); letter-spacing:-.01em;}
+
 .c-join__qr{margin-top:var(--s3);}
 .c-join__qr svg{width:160px; height:160px; display:block;
                 border:1px solid var(--c-hairline); border-radius:var(--r-md);
@@ -1441,6 +1474,8 @@ details[open] .c-libhelp__toggle::after{content:" -";}
      rather than force the panel wider than the screen. */
   .c-join__cmd{white-space:pre-wrap !important; overflow-wrap:anywhere !important;}
   .c-join__code{overflow-wrap:anywhere;}
+  .c-steps-num{gap:var(--s4);}
+  .c-step-num{gap:var(--s2);}
   .c-panel code,.c-panel pre{overflow-wrap:anywhere;}
   .c-join__qr svg{width:128px; height:128px;}
 }
@@ -1625,6 +1660,14 @@ details[open] .c-libhelp__toggle::after{content:" -";}
 .c-veil__panel{pointer-events:auto;}
 .c-shell:has(.c-identity:not(:empty)):has(.c-noworker-hook) .c-conversation > *:not(.c-veil):not(:first-child){
   opacity:.45; filter:saturate(.7);}
+/* THE VEIL REPLACES THE EMPTY STATE, IT DOES NOT SIT ON TOP OF IT.
+   "No agents available" and "No runs yet · pick a model and a worker" are the
+   same news told twice, and on a phone the panel landed across the second
+   one and cut a sentence in half. While the veil is up the transcript's own
+   placeholder stands down. It is hidden rather than removed, so the column
+   keeps its height and nothing jumps when a worker appears. */
+.c-shell:has(.c-identity:not(:empty)):has(.c-noworker-hook) .c-chat .c-empty{
+  visibility:hidden;}
 .c-veil__panel{max-width:380px; text-align:center; background:var(--c-surface);
                border:1px solid var(--c-hairline); border-radius:var(--r-lg);
                box-shadow:var(--e2); padding:var(--s5);}
@@ -1632,12 +1675,26 @@ details[open] .c-libhelp__toggle::after{content:" -";}
   .c-shell:has(.c-identity:not(:empty)):has(.c-noworker-hook) .c-veil{
     padding:var(--s5) var(--s4);}
   .c-veil__panel{padding:var(--s4);}
+  /* With the placeholder stood down there is nothing behind the veil, and a
+     transcript sized for a conversation it cannot yet hold left a phone
+     screen of blank card under the panel. It keeps only the height the panel
+     needs until a worker arrives. `!important` because the minimum is an
+     inline style the component writes for itself. */
+  .c-shell:has(.c-identity:not(:empty)):has(.c-noworker-hook) .c-chat{
+    min-height:300px !important; max-height:300px !important;}
 }
 .c-veil__title{margin:0 0 6px; font-weight:650; font-size:var(--t-lg); color:var(--c-text);}
 .c-veil__body{margin:0 0 var(--s4); color:var(--c-text-2); line-height:1.55;}
-.c-veil__action{display:inline-block; text-decoration:none; background:var(--c-accent);
+.c-veil__action{display:inline-block; background:var(--c-accent);
                 color:#fff; padding:10px 22px; border-radius:var(--r-md); font-weight:600;}
-.c-veil__action:hover{background:var(--c-accent-hover);}
+.c-veil__action:hover{background:var(--c-accent-hover); color:#fff;}
+/* A control is a control: the label inside it is never underlined. Gradio's
+   prose styles underline every anchor, which turned the primary action into
+   underlined text on a dark slab and the nav pills into links wearing a
+   button's clothes. */
+.c-veil__action,.c-veil__action:visited,
+.c-quicknav__link,.c-quicknav__link:visited,
+.c-libcard a,.gradio-container button a{text-decoration:none !important;}
 
 /* ---- Professional polish pass ----------------------------------------- */
 /* Calmer sections: the tail accordions read as pages, not widgets. */

distinct_server/render.py

@@ -177,13 +177,22 @@ def no_tools_note(notice_text: str) -> str:
     )
 
 
-def join_this_server(*, addresses, code: str, qr: str = "", tools: str = "local") -> str:
-    """What to point an agent at, with the address filled in.
+def join_this_server(
+    *, addresses, code: str, qr: str = "", tools: str = "local", source: str = ""
+) -> str:
+    """The whole path from nothing to a running worker, in the order it happens.
+
+    This panel used to be an address, a code and one command, sitting beside a
+    "Download agent" button that pointed at release artifacts nobody builds.
+    The button could only ever fail, and the command it accompanied assumed
+    the code was already on the machine. What a volunteer actually needs is
+    the three steps in between, so those are what this says: get the code,
+    install it, run it.
 
-    This panel exists because the previous instruction was a command with
-    ``SERVER`` written in the middle of it, which asks the reader to go and
-    find something this process already knows. A server knows its own port and
-    can look up its own addresses, so it says them.
+    ``source`` is where the code lives — this Space's own repository when the
+    server knows it. Absent, the step says so plainly instead of guessing at
+    a URL, because sending somebody to a repository that may not exist is
+    worse than admitting the server cannot name one.
 
     ``addresses`` empty is a real state and is reported as one: a server bound
     to loopback is reachable by this machine and nothing else, and an agent on
@@ -204,16 +213,41 @@ def join_this_server(*, addresses, code: str, qr: str = "", tools: str = "local"
         f'<li class="c-join__alt">{esc(url)}</li>' for url in list(addresses)[1:]
     )
     alternates = (
-        f'<p class="c-join__lead">Also reachable at:</p><ul class="c-join__alts">{others}</ul>'
+        f'<p class="c-join__note">Also reachable at {", ".join(esc(str(u)) for u in list(addresses)[1:])}.</p>'
         if others
         else ""
     )
-    code_line = (
-        f'<p class="c-join__lead">Pairing code, one use and ten minutes:</p>'
-        f'<code class="c-join__code">{esc(code)}</code>'
+
+    # STEP ONE: the code. A git clone, because a Space is a git repository and
+    # a clone is the one form that also updates later with `git pull`.
+    if source:
+        get_it = (
+            f'<pre class="c-join__cmd">git clone {esc(source)} distinct</pre>'
+            '<p class="c-join__note">Or use "Download repository" on the Files tab '
+            "and unzip it. Either way you end up with a folder of Python.</p>"
+        )
+    else:
+        get_it = (
+            '<p class="c-join__note">This server does not know its own repository '
+            "address. Ask whoever runs it where the code lives.</p>"
+        )
+
+    # STEP TWO: the install. `-e` so the worker runs from the folder that was
+    # cloned, which is also the folder `git pull` updates.
+    install = (
+        '<pre class="c-join__cmd">cd distinct\npython -m pip install -e ".[agent]"</pre>'
+        '<p class="c-join__note">Python 3.10 or newer. On Windows use '
+        "<code>py -3.12 -m pip</code> if <code>python</code> is an older one.</p>"
+    )
+
+    # STEP THREE: the run, with this server's address and this browser's own
+    # library defaults already in it.
+    code_note = (
+        f'<p class="c-join__note">Pairing code, one use and ten minutes: '
+        f'<code class="c-join__code">{esc(code)}</code></p>'
         if code
-        else '<p class="c-join__lead">Generate a pairing code below, then run the '
-        "command with it.</p>"
+        else '<p class="c-join__note">Generate a pairing code below, then run the '
+        "command with it in place of YOUR-CODE.</p>"
     )
     # One line on purpose. The previous form used backslash continuations,
     # which are bash syntax: pasted into PowerShell they became stray
@@ -226,12 +260,22 @@ def join_this_server(*, addresses, code: str, qr: str = "", tools: str = "local"
     picture = f'<div class="c-join__qr">{qr}</div>' if qr else ""
     return (
         '<div class="c-join">'
-        '<p class="c-join__lead">Point an agent at this address:</p>'
-        f'<code class="c-join__address">{esc(first)}</code>'
-        f"{alternates}{code_line}"
-        f'<p class="c-join__lead">On the machine that will run the model:</p>'
+        '<ol class="c-steps-num">'
+        '<li class="c-step-num"><span class="c-step-num__n">1</span>'
+        '<div class="c-step-num__body"><p class="c-step-num__head">Get the code</p>'
+        f"{get_it}</div></li>"
+        '<li class="c-step-num"><span class="c-step-num__n">2</span>'
+        '<div class="c-step-num__body"><p class="c-step-num__head">Install it</p>'
+        f"{install}</div></li>"
+        '<li class="c-step-num"><span class="c-step-num__n">3</span>'
+        '<div class="c-step-num__body"><p class="c-step-num__head">Point it at this server</p>'
+        f'<code class="c-join__address">{esc(first)}</code>{alternates}{code_note}'
         f'<pre class="c-join__cmd">{esc(command)}</pre>'
-        f"{picture}"
+        "<p class=\"c-join__note\">It prints an access code when it pairs. Give that to "
+        "the people who should be allowed to use your machine — anyone holding it can "
+        "send this worker requests.</p>"
+        f"{picture}</div></li>"
+        "</ol>"
         "</div>"
     )
 

distinct_server/ui.py

@@ -1342,12 +1342,7 @@ def _identity_from_request(request: Optional[Any]) -> Optional[str]:
 
 
 class DistinctUI:
-    def __init__(
-        self,
-        control_plane: Optional[ControlPlane] = None,
-        *,
-        artifact_dir: Path = Path("agent-artifacts"),
-    ) -> None:
+    def __init__(self, control_plane: Optional[ControlPlane] = None) -> None:
         self.control = control_plane or ControlPlane()
         if not self.control.catalogue:
             # The consent handshake needs the server to state what it may ask
@@ -1355,7 +1350,6 @@ class DistinctUI:
             self.control.catalogue = _default_server_catalogue()
         self.agent_api = AgentApi(self.control)
         self.sessions = SessionAuthorizer()
-        self.artifact_dir = artifact_dir.resolve()
         # Where claimed run artifacts are stored, per session, so the Outputs
         # panel can offer them for download. Session-scoped and deleted with
         # the session.
@@ -3055,7 +3049,15 @@ class DistinctUI:
         # page, so what the person copies is what their runs will expect.
         chosen = _library_defaults(state) if state is not None else ()
         tools = ",".join(chosen) if chosen else "local"
-        return render.join_this_server(addresses=addresses, code=code, qr=qr, tools=tools)
+        # Where the code lives, taken from the platform rather than written
+        # down here. A hard-coded URL is a URL that goes stale the first time
+        # this is deployed anywhere else, and the panel would then send
+        # volunteers to somebody else's repository.
+        space_id = os.environ.get("SPACE_ID", "").strip()
+        source = f"https://huggingface.co/spaces/{space_id}" if space_id else ""
+        return render.join_this_server(
+            addresses=addresses, code=code, qr=qr, tools=tools, source=source
+        )
 
     # Pairing/downloads ------------------------------------------------
 
@@ -3072,35 +3074,12 @@ class DistinctUI:
         except (ControlPlaneError, LoginRequired, ValueError) as exc:
             raise gr.Error(str(exc)) from exc
 
-    def download_agent(
-        self,
-        platform_name: str,
-        state: Mapping[str, Any],
-        profile: gr.OAuthProfile | None,
-        request: gr.Request | None = None,
-    ) -> str:
-        try:
-            self._authorize(state, profile, request)
-            patterns = {
-                "Windows x86-64": "distinct-agent-v*-windows-x86_64.zip",
-                "Linux x86-64": "distinct-agent-v*-linux-x86_64.tar.gz",
-            }
-            pattern = patterns.get(platform_name)
-            if pattern is None:
-                raise ValueError("select a supported agent build")
-            candidates = sorted(self.artifact_dir.glob(pattern), reverse=True)
-            if not candidates:
-                raise ValueError(
-                    f"{platform_name} artifact has not been built for this Space revision"
-                )
-            target = candidates[0].resolve()
-            if target.parent != self.artifact_dir or not target.is_file():
-                raise ValueError(
-                    f"{platform_name} artifact has not been built for this Space revision"
-                )
-            return str(target)
-        except (ControlPlaneError, LoginRequired, ValueError) as exc:
-            raise gr.Error(str(exc)) from exc
+    # The worker is Python, distributed as this repository's own source, so
+    # there is no build artifact to serve and no `download_agent` handler any
+    # more. The setup panel says where the code is and how to install it; see
+    # `render.join_this_server`. If frozen builds ever ship, they belong on a
+    # releases page, not behind a control that fails silently when the page
+    # for this revision was never built.
 
     # Component graph --------------------------------------------------
 
@@ -3161,16 +3140,9 @@ class DistinctUI:
                 # library is a destination rather than a section, so its
                 # control is a button that swaps the view; "Run an agent" is
                 # still a section of this page, so it stays an anchor.
-                with gr.Row(elem_classes="c-quicknav"):
-                    open_library = gr.Button(
-                        "Library", size="sm", variant="secondary",
-                        elem_classes="c-quicknav__btn", scale=0,
-                    )
-                    gr.HTML(
-                        '<a class="c-quicknav__link" href="#join-agent">Run an agent</a>'
-                    )
-
-                # THE SIGN-IN CONTROL, AND WHY IT IS CONDITIONAL.
+                #
+                # THE SIGN-IN CONTROL SITS IN THIS ROW, AND WHY IT IS
+                # CONDITIONAL.
                 #
                 # On a Space, Gradio only wires real OAuth when the interface
                 # contains a `LoginButton`: `gradio.routes` gates the whole
@@ -3189,8 +3161,23 @@ class DistinctUI:
                 # self-hosted deployment uses the `/auth/login` route in
                 # `auth_routes.py` instead, which is a link rather than a
                 # component because it is an ordinary HTTP redirect.
-                if gradio_oauth_is_real():
-                    gr.LoginButton("Sign in with Hugging Face", size="sm")
+                #
+                # It is inside the nav row rather than under it because it is
+                # navigation: left on its own line it read as a stray control
+                # sitting between the page's chrome and its content.
+                with gr.Row(elem_classes="c-quicknav"):
+                    open_library = gr.Button(
+                        "Library", size="sm", variant="secondary",
+                        elem_classes="c-quicknav__btn", scale=0,
+                    )
+                    gr.HTML(
+                        '<a class="c-quicknav__link" href="#join-agent">Run an agent</a>'
+                    )
+                    if gradio_oauth_is_real():
+                        gr.LoginButton(
+                            "Sign in with Hugging Face", size="sm",
+                            elem_classes="c-quicknav__auth", scale=0,
+                        )
 
                 gr.HTML(render.notice())
 
@@ -3491,20 +3478,22 @@ class DistinctUI:
                         # which asked the reader to find something this
                         # process already knew.
                         join_panel = gr.HTML(self._join_panel())
-                        # Three controls spread across the full page width read
-                        # as three unrelated controls. Held to a measure they
-                        # read as one step.
+                        # ONE CONTROL, BECAUSE THERE IS ONE THING TO DO HERE.
+                        #
+                        # This row used to offer "Agent build: Windows x86-64"
+                        # and a Download button beside it. No such build is
+                        # produced for this Space, so the button's only
+                        # possible outcome was an error telling the volunteer
+                        # that an artifact "has not been built for this Space
+                        # revision" — a sentence about our release process,
+                        # delivered to somebody who wanted to help. The worker
+                        # is Python and always was; the panel above now says
+                        # so, and the only control left is the one that mints
+                        # the code those instructions need.
                         with gr.Row(elem_classes="c-tail__row"):
-                            platform_name = gr.Dropdown(
-                                choices=["Windows x86-64", "Linux x86-64"],
-                                value="Windows x86-64",
-                                label="Agent build",
+                            create_code = gr.Button(
+                                "Generate pairing code", variant="primary", scale=0
                             )
-                            download = gr.DownloadButton(
-                                "Download agent", variant="secondary"
-                            )
-                            create_code = gr.Button("Generate pairing code")
-                        gr.Markdown()
 
                     with gr.Accordion("Model assessments and their sources", open=False):
                         gr.HTML(
@@ -3811,14 +3800,6 @@ class DistinctUI:
                 queue=False,
                 api_visibility="private",
             )
-            download.click(
-                self.download_agent,
-                inputs=[platform_name, session_state],
-                outputs=[download],
-                queue=False,
-                api_visibility="private",
-            )
-
             # Two seconds, not five. The activity panel counts elapsed time
             # and streams the worker's steps, and a spinner that updates
             # every five seconds reads as a stall. The refresh is in-memory

pyproject.toml

@@ -11,6 +11,11 @@ dependencies = ["gradio[oauth]==6.24.0"]
 
 [project.optional-dependencies]
 agent = [
+    # Ed25519, for the detached snapshot signature. A direct requirement, not
+    # a transitive one: `distinct_protocol.handshake` imports it and refuses
+    # to fall back to HMAC, so an agent install that happens to miss it fails
+    # at the moment it pairs rather than at install time.
+    "cryptography>=42",
     "dspy[deno]==3.3.0",
     "gradio_client==2.6.0",
     "pyRAPL==0.2.3.1; sys_platform == 'linux'",

scripts/demo_server.py

@@ -25,11 +25,11 @@ sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
 from distinct_protocol.netpolicy import announce_bind, launch_kwargs  # noqa: E402
 from distinct_server import ControlPlane  # noqa: E402
-from distinct_server.presentation import CSS, HEAD  # noqa: E402
 from distinct_server.identity import (  # noqa: E402
     NotConfigured,
     refuse_mocked_oauth,
 )
+from distinct_server.presentation import CSS, HEAD  # noqa: E402
 from distinct_server.ui import build_app, distinct_theme  # noqa: E402
 
 

scripts/live_e2e.py

@@ -292,10 +292,18 @@ def capture(playwright, server_url: str, shots: Shots, worker_started) -> None:
 
         open_section(other, "Run a community agent")
         other.wait_for_timeout(2000)
+        # The panel is now three steps rather than a build to download, so the
+        # screenshot is checked for what it must say. A caption promising a
+        # Windows build outlived the button that offered one; this asserts
+        # instead of describing.
+        setup = other.locator(".c-join").inner_text()
+        for needle in ("Get the code", "Install it", "pip install -e", "Point it at this server"):
+            if needle not in setup:
+                raise AssertionError(f"the setup panel no longer says {needle!r}")
         shots.take(
             other,
-            "download-the-agent",
-            "Where a volunteer gets the worker for their own machine, Windows or Linux.",
+            "set-up-the-agent",
+            "How a volunteer gets the worker running: the code, the install, the command.",
         )
 
         worker_screen(browser, shots)
@@ -503,7 +511,7 @@ def main() -> int:
             found = re.search(r"\b([A-Z0-9]{5}(?:-[A-Z0-9]{4,5}){5,8})\b", line)
             if found:
                 threading.Thread(
-                    target=lambda: [print(f"    worker | {l.rstrip()}") for l in process.stdout],
+                    target=lambda: [print(f"    worker | {line.rstrip()}") for line in process.stdout],
                     daemon=True,
                 ).start()
                 return found.group(1)