benchflow 0.7.2.dev1986__tar.gz → 0.7.2.dev1994__tar.gz

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/CHANGELOG.md

@@ -3,6 +3,17 @@
 ## [Unreleased]
 
 ### Added
+- **The trajectory viewer can collect the eval-prize confirmation in the
+  browser.** `bench eval view PATH --confirm` renders the normal page plus a
+  sticky site-styled bottom bar ("Submit this trajectory to the BenchFlow
+  eval prize?") with **Approve & submit** / **Not this one** buttons. A click
+  POSTs to `/decision`; the server prints a machine-readable
+  `DECISION: approved` or `DECISION: rejected` line to stdout, shuts down,
+  and the CLI exits `0` on approve and `3` on reject (non-1/2 so rejection
+  never collides with error or usage exits). Without the flag, behavior is
+  unchanged (no bar, no endpoint, Ctrl+C to stop). The
+  `benchflow-traj-upload` skill now prefers the button flow and falls back
+  to chat confirmation on CLIs older than 0.7.2.
 - **Trajectory uploads are tagged with the session's repository by
   default.** Unless `--source-id` is given, `bench traj upload` reads the
   session's recorded working directory (Claude `cwd` events, Codex
@@ -14,6 +25,31 @@
   undetectable repos fall back silently to the path-derived source id.
 
 ### Changed
+- **Trajectory viewer tool calls are color-coded and backgrounds are light.**
+  Each tool kind now gets a muted GitHub-label-style accent on its name pill
+  and a left border strip on the card: shell/exec → amber, write/edit → blue,
+  read → teal, agent/task/skill → purple, web/search/fetch → cyan, everything
+  else → neutral gray. Tool arguments and tool outputs render on light
+  surfaces (`#f5f5f5` / white with dark ink) instead of near-black blocks;
+  the dark `#141414` terminal treatment is reserved for shell-command output
+  only, and the ink-black result card stays as the deliberate bento-ink
+  accent. Presentation only (CSS classes + a tool-name→accent mapping);
+  content strings and behavior are unchanged. Applies to all three viewer
+  templates, which share one stylesheet since #1019.
+- **The contributor prompt now tells the agent to upgrade BenchFlow first.**
+  `CONTRIBUTOR_PROMPT` (kept in sync in `README.md`, `docs/traj-upload.md`,
+  and the `benchflow-traj-upload` skill evals) is a three-line block that
+  says to run `uv tool install --python 3.12 --upgrade --force benchflow`
+  before reading the skill, so agents that skim the skill or hit a stale copy
+  still install the latest CLI. The prompt also names OpenCode and Cursor
+  sessions and the re:Agent hackathon 72-hour window; README/docs render it
+  as a blockquote (soft-wraps on GitHub) behind an explicit "send this to
+  your coding agent" framing, and `bench traj setup` prints the same framing.
+  The skill's Discover step gains best-effort Cursor
+  (`~/.cursor/projects/*/agent-transcripts/`) and OpenCode
+  (`~/.local/share/opencode/opencode.db`, `opencode db path`) locations plus
+  a prefer-recent-matching-sessions note. Follow-up to the version
+  precondition from #1013/#1014.
 - **Trajectory viewer restyled to match www.benchflow.ai.** All three
   `bench eval view` pages (stream-json/JSONL, ACP events, multi-turn trial)
   now share one inline stylesheet with the site's design language: light

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: benchflow
-Version: 0.7.2.dev1986
+Version: 0.7.2.dev1994
 Summary: Multi-turn agent benchmarking with ACP — run any agent, any model, any provider.
 Project-URL: Homepage, https://github.com/benchflow-ai/benchflow
 Project-URL: Repository, https://github.com/benchflow-ai/benchflow
@@ -89,20 +89,23 @@ BenchFlow is a universal environment framework: it runs AI agents against task e
 
 ## Quick start: 1. Submit a trajectory
 
-Proud of a Claude Code or Codex session? Copy this line into Claude Code,
-Codex, Cursor, or any coding agent. That is the $2,000 eval prize path. No
-BenchFlow account, API key, or Azure login.
+**Send these to your coding agent.** Copy
+the block below and paste it as a message to Claude Code, Codex, OpenCode, or
+Cursor. That is the $2,000 eval prize path. No BenchFlow account, API key, or
+Azure login.
 
-```
-Submit my best local Claude Code or Codex session to the BenchFlow eval prize. Read https://raw.githubusercontent.com/benchflow-ai/benchflow/main/.agents/skills/benchflow-traj-upload/SKILL.md and follow it: find a session, open the viewer, upload only after I review it.
-```
+> Submit my relevant local Claude Code, Codex, OpenCode, or Cursor session from the re:Agent e2e agentic science / ai4bio hackathon (last 72 hours, on this laptop) to the BenchFlow eval prize.
+>
+> 1. First make sure the latest benchflow CLI is installed: uv tool install --python 3.12 --upgrade --force benchflow
+>
+> 2. Then read https://raw.githubusercontent.com/benchflow-ai/benchflow/main/.agents/skills/benchflow-traj-upload/SKILL.md and follow it: find a session, open the viewer, and upload only after I (the human) review it.
 
 The agent finds sessions on this machine, opens the viewer, and uploads after
 you like what you see.
 
-Be on the latest BenchFlow first — `uv tool install --python 3.12 --upgrade
---force benchflow`. The `bench traj` commands print a one-line upgrade hint
-when a newer release is available.
+The prompt has the agent install the latest BenchFlow first (`uv tool
+install --python 3.12 --upgrade --force benchflow`). The `bench traj` commands
+also print a one-line upgrade hint when a newer release is available.
 
 Prefer the terminal instead? The guided upload inspects before anything leaves
 your machine — it renders a redacted trajectory report (step counts, masked
@@ -128,7 +131,7 @@ bench traj setup
 ```
 
 `npx skills add` asks which agents to install for. `bench traj setup` copies
-the skill into this project and prints the same paste line. See the
+the skill into this project and prints the same agent prompt. See the
 [upload skill](./.agents/skills/benchflow-traj-upload/SKILL.md).
 
 ## Quick start: 2. Run with a ChatGPT or Claude subscription

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/README.md

@@ -15,20 +15,23 @@ BenchFlow is a universal environment framework: it runs AI agents against task e
 
 ## Quick start: 1. Submit a trajectory
 
-Proud of a Claude Code or Codex session? Copy this line into Claude Code,
-Codex, Cursor, or any coding agent. That is the $2,000 eval prize path. No
-BenchFlow account, API key, or Azure login.
+**Send these to your coding agent.** Copy
+the block below and paste it as a message to Claude Code, Codex, OpenCode, or
+Cursor. That is the $2,000 eval prize path. No BenchFlow account, API key, or
+Azure login.
 
-```
-Submit my best local Claude Code or Codex session to the BenchFlow eval prize. Read https://raw.githubusercontent.com/benchflow-ai/benchflow/main/.agents/skills/benchflow-traj-upload/SKILL.md and follow it: find a session, open the viewer, upload only after I review it.
-```
+> Submit my relevant local Claude Code, Codex, OpenCode, or Cursor session from the re:Agent e2e agentic science / ai4bio hackathon (last 72 hours, on this laptop) to the BenchFlow eval prize.
+>
+> 1. First make sure the latest benchflow CLI is installed: uv tool install --python 3.12 --upgrade --force benchflow
+>
+> 2. Then read https://raw.githubusercontent.com/benchflow-ai/benchflow/main/.agents/skills/benchflow-traj-upload/SKILL.md and follow it: find a session, open the viewer, and upload only after I (the human) review it.
 
 The agent finds sessions on this machine, opens the viewer, and uploads after
 you like what you see.
 
-Be on the latest BenchFlow first — `uv tool install --python 3.12 --upgrade
---force benchflow`. The `bench traj` commands print a one-line upgrade hint
-when a newer release is available.
+The prompt has the agent install the latest BenchFlow first (`uv tool
+install --python 3.12 --upgrade --force benchflow`). The `bench traj` commands
+also print a one-line upgrade hint when a newer release is available.
 
 Prefer the terminal instead? The guided upload inspects before anything leaves
 your machine — it renders a redacted trajectory report (step counts, masked
@@ -54,7 +57,7 @@ bench traj setup
 ```
 
 `npx skills add` asks which agents to install for. `bench traj setup` copies
-the skill into this project and prints the same paste line. See the
+the skill into this project and prints the same agent prompt. See the
 [upload skill](./.agents/skills/benchflow-traj-upload/SKILL.md).
 
 ## Quick start: 2. Run with a ChatGPT or Claude subscription

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "benchflow"
-version = "0.7.2.dev1986"
+version = "0.7.2.dev1994"
 description = "Multi-turn agent benchmarking with ACP — run any agent, any model, any provider."
 readme = "README.md"
 requires-python = ">=3.12"

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/src/benchflow/cli/main.py

@@ -1228,11 +1228,27 @@ def eval_view(
         ),
     ],
     port: Annotated[int, typer.Option(help="Server port")] = 8888,
+    confirm: Annotated[
+        bool,
+        typer.Option(
+            "--confirm",
+            help=(
+                "Show an Approve & submit / Not this one bar on the page; "
+                "print DECISION: approved|rejected and exit 0 on approve, "
+                "3 on reject."
+            ),
+        ),
+    ] = False,
 ) -> None:
     """View a trial or session trajectory in the browser."""
-    from benchflow.trajectories.viewer import serve
-
-    serve(str(rollout_dir), port)
+    from benchflow.trajectories import viewer
+
+    decision = viewer.serve(str(rollout_dir), port, confirm=confirm)
+    # Exit-code contract for --confirm: 0 approved, 3 rejected. 3 is chosen
+    # so a rejection never collides with the CLI's existing error exits
+    # (1 = errors, 2 = Typer usage errors).
+    if decision == "rejected":
+        raise typer.Exit(3)
 
 
 # ── Command-group wiring ──────────────────────────────────────────────

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/src/benchflow/cli/traj.py

@@ -54,14 +54,26 @@ SKILL_RAW_URL = (
     "/.agents/skills/benchflow-traj-upload/SKILL.md"
 )
 
+UPGRADE_COMMAND = "uv tool install --python 3.12 --upgrade --force benchflow"
+
+# Three unwrapped lines separated by blank lines: each logical unit is one
+# full physical line (no hard wraps mid-sentence), so the URL and the upgrade
+# command stay selectable in agents and terminals.
 CONTRIBUTOR_PROMPT = (
-    "Submit my best local Claude Code or Codex session to the BenchFlow eval "
-    "prize. Read "
-    f"{SKILL_RAW_URL} "
-    "and follow it: find a session, open the viewer, upload only after I review it."
+    "Submit my relevant local Claude Code, Codex, OpenCode, or Cursor session "
+    "from the re:Agent e2e agentic science / ai4bio hackathon (last 72 hours, "
+    "on this laptop) to the BenchFlow eval prize."
+    "\n\n"
+    f"1. First make sure the latest benchflow CLI is installed: {UPGRADE_COMMAND}"
+    "\n\n"
+    f"2. Then read {SKILL_RAW_URL} "
+    "and follow it: find a session, open the viewer, and upload only after "
+    "I (the human) review it."
 )
 
-UPGRADE_COMMAND = "uv tool install --python 3.12 --upgrade --force benchflow"
+CONTRIBUTOR_PROMPT_FRAMING = (
+    "Send this to your coding agent (it's a prompt for the agent, not steps for you):"
+)
 
 
 def _fetch_latest_version() -> str | None:
@@ -166,14 +178,14 @@ def register_traj(app: typer.Typer) -> None:
         ] = False,
         prompt_only: Annotated[
             bool,
-            typer.Option("--prompt", help="Print the copy-paste agent line and exit"),
+            typer.Option("--prompt", help="Print the copy-paste agent prompt and exit"),
         ] = False,
         list_sessions: Annotated[
             bool,
             typer.Option("--list", help="List recent local sessions and exit"),
         ] = False,
     ) -> None:
-        """Install the submit skill, or print the line to paste into an agent."""
+        """Install the submit skill, or print the prompt to send to an agent."""
         _maybe_print_update_hint()
         if prompt_only:
             _print_contributor_prompt()
@@ -194,7 +206,6 @@ def register_traj(app: typer.Typer) -> None:
                 _run_npx_skill_install()
         else:
             _install_project_skill(Path.cwd())
-        console.print("Paste this to your agent:")
         _print_contributor_prompt()
         if interactive and typer.confirm(
             "List recent sessions and open the viewer now?", default=False
@@ -625,7 +636,9 @@ def _print_dry_run(staged: StagedCapture) -> None:
 
 
 def _print_contributor_prompt() -> None:
-    # One physical line so people can copy it. Rich wrapping would break that.
+    # Plain print: Rich wrapping would break the unbroken URL line and make
+    # the block awkward to copy.
+    print(CONTRIBUTOR_PROMPT_FRAMING)
     print(CONTRIBUTOR_PROMPT)
 
 
@@ -671,7 +684,7 @@ def _run_npx_skill_install() -> None:
         check=False,
     )
     if completed.returncode != 0:
-        print_error("npx skills add failed; the copy-paste line below still works.")
+        print_error("npx skills add failed; the copy-paste prompt below still works.")
 
 
 def _print_session_hits() -> None:

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/src/benchflow/trajectories/viewer.py

@@ -16,9 +16,15 @@ _RESULT_PREVIEW = 300  # max chars for result summary
 
 # Shared stylesheet for all viewer pages, matching the www.benchflow.ai design
 # language (light monochrome: near-white page, white cards, near-black ink,
-# pure-black accent, Satoshi/Google Sans Code with system-safe fallbacks, dark
-# code blocks). Kept inline so pages work fully offline with no external
-# requests; one constant so the three templates stop drifting apart.
+# Satoshi/Google Sans Code with system-safe fallbacks). Kept inline so pages
+# work fully offline with no external requests; one constant so the three
+# templates stop drifting apart.
+#
+# The site itself is deliberately achromatic, so tool-call accents below are
+# muted GitHub-label-style pastels (pale chip background + darker same-hue
+# text + a soft left border strip) that read as annotations rather than
+# fighting the monochrome base. The dark #141414 code treatment is reserved
+# for terminal output of shell commands; everything else stays light.
 _VIEWER_CSS = """\
 * { margin: 0; padding: 0; box-sizing: border-box; }
 :root {
@@ -46,8 +52,10 @@ body { font-family: var(--font-sans); background: var(--background); color: var(
 .meta span { font-family: var(--font-mono); font-size: 11px; font-weight: 500; color: var(--ink-secondary); background: var(--secondary); padding: 3px 9px; border-radius: 4px; border: 1px solid var(--border); }
 .step { margin-bottom: 8px; padding: 12px 16px; border-radius: var(--radius); background: var(--card); border: 1px solid var(--border); box-shadow: 0 1px 2px rgba(10, 10, 10, 0.04); }
 .step.prompt { background: var(--secondary); border-color: var(--rule-strong); margin-bottom: 14px; }
-.step.output { background: var(--code-bg); border-color: var(--code-bg); padding: 10px 16px; }
-.step.output pre { color: var(--code-ink); font-family: var(--font-mono); font-size: 12px; line-height: 1.7; white-space: pre-wrap; word-break: break-word; }
+.step.output { background: var(--card); border-color: var(--border); padding: 10px 16px; }
+.step.output pre { color: var(--ink-secondary); font-family: var(--font-mono); font-size: 12px; line-height: 1.7; white-space: pre-wrap; word-break: break-word; }
+.step.output.term { background: var(--code-bg); border-color: var(--code-bg); }
+.step.output.term pre { color: var(--code-ink); }
 .step.result { background: var(--ink); border-color: var(--ink); margin-top: 14px; }
 .step.result .msg { color: var(--background); }
 .step-header { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
@@ -59,12 +67,70 @@ body { font-family: var(--font-sans); background: var(--background); color: var(
 .msg { font-size: 14px; line-height: 1.65; white-space: pre-wrap; word-break: break-word; }
 .thinking { font-size: 13px; color: var(--muted); font-style: italic; margin-bottom: 8px; padding: 8px 12px; background: var(--secondary); border-radius: 4px; border-left: 2px solid var(--rule-strong); white-space: pre-wrap; word-break: break-word; }
 .tool { margin-bottom: 6px; }
-.tool-name { display: inline-flex; align-items: center; font-family: var(--font-mono); font-size: 11px; font-weight: 600; color: var(--ink); background: var(--secondary); border: 1px solid var(--border); padding: 2px 9px; border-radius: 4px; }
-.tool-args { margin-top: 6px; font-family: var(--font-mono); font-size: 12px; line-height: 1.7; color: var(--code-ink); background: var(--code-bg); padding: 10px 12px; border-radius: 6px; white-space: pre-wrap; word-break: break-word; }
+.tool-name { display: inline-flex; align-items: center; font-family: var(--font-mono); font-size: 11px; font-weight: 600; color: var(--acc-ink, var(--ink)); background: var(--acc-bg, var(--secondary)); border: 1px solid var(--acc-line, var(--border)); padding: 2px 9px; border-radius: 4px; }
+.tool-args { margin-top: 6px; font-family: var(--font-mono); font-size: 12px; line-height: 1.7; color: var(--ink-secondary); background: var(--secondary); border: 1px solid var(--border); padding: 10px 12px; border-radius: 6px; white-space: pre-wrap; word-break: break-word; }
+.step.tool-step { border-left: 3px solid var(--acc-strip, var(--rule-strong)); }
+.acc-bash  { --acc-bg: #f7efda; --acc-line: #ecdcb2; --acc-ink: #8a5a12; --acc-strip: #dcb45e; }
+.acc-edit  { --acc-bg: #e8f0fa; --acc-line: #d0dff1; --acc-ink: #1d4e89; --acc-strip: #7fa8d8; }
+.acc-read  { --acc-bg: #e5f2ec; --acc-line: #cbe3d7; --acc-ink: #1a6b52; --acc-strip: #74bda0; }
+.acc-agent { --acc-bg: #efeaf8; --acc-line: #ded3ef; --acc-ink: #5b3e96; --acc-strip: #a78fd6; }
+.acc-web   { --acc-bg: #e3f1f6; --acc-line: #c8e2ea; --acc-ink: #176478; --acc-strip: #6fb6ca; }
+.acc-other { --acc-bg: var(--secondary); --acc-line: var(--border); --acc-ink: var(--ink-secondary); --acc-strip: var(--rule-strong); }
 .metrics { font-family: var(--font-mono); font-size: 11px; color: var(--faint); margin-top: 4px; }
 .turn-divider { border-top: 1px solid var(--border); margin: 24px 0; }
 """
 
+# Sticky bottom confirmation bar injected only in --confirm mode. Styling
+# reuses the page's CSS variables (white surface, top border, ink text, pill
+# buttons) so it reads as part of the same www.benchflow.ai design language.
+# The <style> block rides along with the snippet so plain (non-confirm) pages
+# carry zero confirm markup or CSS.
+_CONFIRM_BAR_HTML = """\
+<style>
+body { padding-bottom: 104px; }
+.confirm-bar { position: fixed; bottom: 0; left: 0; right: 0; background: var(--card); border-top: 1px solid var(--border); box-shadow: 0 -1px 3px rgba(10, 10, 10, 0.05); z-index: 10; }
+.confirm-inner { max-width: 960px; margin: 0 auto; padding: 14px 20px; display: flex; align-items: center; justify-content: space-between; gap: 16px; flex-wrap: wrap; }
+.confirm-question { font-size: 14px; font-weight: 500; color: var(--ink); }
+.confirm-actions { display: flex; gap: 8px; flex: none; }
+.confirm-btn { font-family: var(--font-sans); font-size: 13px; font-weight: 600; letter-spacing: -0.01em; padding: 8px 18px; border-radius: 9999px; cursor: pointer; transition: background 0.15s ease; }
+.confirm-btn.approve { background: var(--ink); color: var(--background); border: 1px solid var(--ink); }
+.confirm-btn.approve:hover { background: #262626; }
+.confirm-btn.reject { background: var(--card); color: var(--ink); border: 1px solid var(--rule-strong); }
+.confirm-btn.reject:hover { background: var(--secondary); }
+</style>
+<div class="confirm-bar">
+<div class="confirm-inner" id="confirm-inner">
+<span class="confirm-question">Submit this trajectory to the BenchFlow eval prize?</span>
+<div class="confirm-actions">
+<button class="confirm-btn approve" onclick="__benchDecide('approve')">Approve &amp; submit</button>
+<button class="confirm-btn reject" onclick="__benchDecide('reject')">Not this one</button>
+</div>
+</div>
+</div>
+<script>
+async function __benchDecide(choice) {
+  try {
+    await fetch("/decision", { method: "POST", body: choice });
+  } catch (err) {
+    // The server exits right after answering; a dropped socket is still a
+    // delivered decision, so fall through to the confirmation note.
+  }
+  document.getElementById("confirm-inner").innerHTML =
+    choice === "approve"
+      ? '<span class="confirm-question">Approved — go back to your agent.</span>'
+      : '<span class="confirm-question">Rejected — tell your agent which session instead.</span>';
+}
+</script>
+"""
+
+
+def _inject_confirm_bar(page: str) -> str:
+    """Append the confirm bar just before </body> (or at the end as fallback)."""
+    if "</body>" in page:
+        return page.replace("</body>", f"{_CONFIRM_BAR_HTML}</body>", 1)
+    return page + _CONFIRM_BAR_HTML
+
+
 # Small BenchFlow wordmark header (inline SVG logo from the site's icon set —
 # no external requests) shown above the page title on every viewer page.
 _WORDMARK_HTML = (
@@ -87,6 +153,28 @@ _WORDMARK_HTML = (
 )
 
 
+# Tool kind → accent class. Substring matching so it covers Claude Code tool
+# names (Bash, Write, Edit, Read, Agent, WebSearch, ...), ACP kinds (execute,
+# edit, read, search, fetch, ...), and Codex function names (shell, ...).
+# Order matters: earlier entries win (e.g. "websearch" hits web before read).
+_TOOL_ACCENTS: tuple[tuple[str, tuple[str, ...]], ...] = (
+    ("acc-web", ("web", "search", "fetch", "grep", "glob", "browser")),
+    ("acc-bash", ("bash", "shell", "exec", "terminal", "command")),
+    ("acc-edit", ("write", "edit", "patch", "delete", "move", "notebook")),
+    ("acc-read", ("read", "cat", "view", "ls", "list")),
+    ("acc-agent", ("agent", "task", "skill", "oracle")),
+)
+
+
+def _tool_accent_class(name: str) -> str:
+    """Map a tool name/kind to its accent CSS class (presentation only)."""
+    lowered = name.lower()
+    for css_class, needles in _TOOL_ACCENTS:
+        if any(needle in lowered for needle in needles):
+            return css_class
+    return "acc-other"
+
+
 def render_turn(events: list[dict], turn_number: int, prompt: str = "") -> str:
     """Render one turn's events as HTML blocks."""
     blocks = []
@@ -103,6 +191,9 @@ def render_turn(events: list[dict], turn_number: int, prompt: str = "") -> str:
     # Group: thinking → text → tool_use → tool_result → thinking → ...
     pending_thinking = ""
     pending_text = ""
+    # tool_use id → accent class, so each tool_result can match its call's
+    # accent and shell results alone keep the dark terminal treatment.
+    accent_by_tool_id: dict[str, str] = {}
 
     for event in events:
         etype = event.get("type", "")
@@ -160,7 +251,13 @@ def render_turn(events: list[dict], turn_number: int, prompt: str = "") -> str:
                         f"</div>"
                     )
 
-                    blocks.append(f'<div class="step agent">{"".join(parts)}</div>')
+                    accent = _tool_accent_class(block.get("name", ""))
+                    if block.get("id"):
+                        accent_by_tool_id[str(block["id"])] = accent
+                    blocks.append(
+                        f'<div class="step agent tool-step {accent}">'
+                        f"{''.join(parts)}</div>"
+                    )
 
         elif etype == "user":
             content = event.get("message", {}).get("content", "")
@@ -181,8 +278,13 @@ def render_turn(events: list[dict], turn_number: int, prompt: str = "") -> str:
                             display = "[binary content]"
                         else:
                             display = html.escape(raw[:400])
+                        accent = accent_by_tool_id.get(
+                            str(block.get("tool_use_id", "")), "acc-other"
+                        )
+                        term = " term" if accent == "acc-bash" else ""
                         blocks.append(
-                            f'<div class="step output"><pre>{display}</pre></div>'
+                            f'<div class="step output tool-step {accent}{term}">'
+                            f"<pre>{display}</pre></div>"
                         )
                     elif block.get("type") == "text" and block.get("text"):
                         texts.append(str(block["text"]))
@@ -408,8 +510,13 @@ def _render_acp_events(
             kind = html.escape(event.get("kind", ""))
             event_title = html.escape(event.get("title", ""))
             status = event.get("status", "")
+            # ACP kinds are coarse ("other" covers Skill/Task/...); when the
+            # kind doesn't map, fall back to the human title for the accent.
+            accent = _tool_accent_class(event.get("kind", ""))
+            if accent == "acc-other":
+                accent = _tool_accent_class(event.get("title", ""))
             blocks.append(
-                f'<div class="step agent">'
+                f'<div class="step agent tool-step {accent}">'
                 f'<div class="tool"><span class="tool-name">{kind}</span> {event_title}</div>'
                 f'<div class="metrics">{status}</div>'
                 f"</div>"
@@ -578,9 +685,21 @@ def _stream_json_page(title: str, events: list[dict], turn_blocks: list[str]) ->
 
 
 def serve(
-    rollout_path: str, port: int = 8888, prompts: list[str] | None = None
-) -> None:
-    """Serve a trial directory or a session JSONL file as a web page."""
+    rollout_path: str,
+    port: int = 8888,
+    prompts: list[str] | None = None,
+    confirm: bool = False,
+) -> str | None:
+    """Serve a trial directory or a session JSONL file as a web page.
+
+    With ``confirm=True`` the page carries an Approve/Reject bar posting to
+    ``/decision``; the first valid decision shuts the server down and is
+    returned as ``"approved"`` or ``"rejected"`` after printing a
+    machine-readable ``DECISION: <value>`` line to stdout. Without it the
+    server runs until Ctrl+C and the return value is ``None`` — exactly the
+    pre-confirm behavior (no bar, no POST endpoint).
+    """
+    import threading
     from http.server import HTTPServer, SimpleHTTPRequestHandler
 
     path = Path(rollout_path)
@@ -600,11 +719,20 @@ def serve(
         print(f"No trajectories found in {path}")
         sys.exit(1)
     if write_sidecar:
+        # The sidecar stays the plain page: the confirm bar is a one-shot
+        # interaction against this live server, not part of the artifact.
         (path / "trajectory.html").write_text(html_content)
+    if confirm:
+        html_content = _inject_confirm_bar(html_content)
 
     print(f"Trajectory viewer: http://localhost:{port}")
     print(f"Trial: {path}")
-    print("Press Ctrl+C to stop\n")
+    if confirm:
+        print("Waiting for Approve / Not this one in the browser (Ctrl+C to stop)\n")
+    else:
+        print("Press Ctrl+C to stop\n")
+
+    decision: str | None = None
 
     class Handler(SimpleHTTPRequestHandler):
         def do_GET(self):
@@ -616,11 +744,44 @@ def serve(
         def log_message(self, format, *args):
             pass
 
-    server = HTTPServer(("localhost", port), Handler)
+    handler_cls: type[SimpleHTTPRequestHandler] = Handler
+
+    if confirm:
+
+        class ConfirmHandler(Handler):
+            def do_POST(self):
+                nonlocal decision
+                if self.path != "/decision":
+                    self.send_error(404)
+                    return
+                length = int(self.headers.get("Content-Length") or 0)
+                body = self.rfile.read(length).decode("utf-8", "replace").strip()
+                if body not in ("approve", "reject"):
+                    self.send_error(400, "Body must be 'approve' or 'reject'")
+                    return
+                decision = "approved" if body == "approve" else "rejected"
+                self.send_response(200)
+                self.send_header("Content-Type", "text/plain; charset=utf-8")
+                self.end_headers()
+                self.wfile.write(decision.encode())
+                # shutdown() blocks until serve_forever returns, and this
+                # handler runs inside that loop — stop from a helper thread.
+                threading.Thread(target=server.shutdown, daemon=True).start()
+
+        handler_cls = ConfirmHandler
+
+    server = HTTPServer(("localhost", port), handler_cls)
     try:
         server.serve_forever()
     except KeyboardInterrupt:
         print("\nStopped.")
+        return None
+    finally:
+        server.server_close()
+
+    if decision is not None:
+        print(f"DECISION: {decision}", flush=True)
+    return decision
 
 
 if __name__ == "__main__":

{benchflow-0.7.2.dev1986 → benchflow-0.7.2.dev1994}/tests/test_traj_upload_cli.py

@@ -715,17 +715,46 @@ def test_skip_update_check_env_var_never_fetches(
 
 
 def test_setup_prompt_prints_the_copy_paste_line() -> None:
-    """The human path is one line to paste into an agent."""
-    from benchflow.cli.traj import CONTRIBUTOR_PROMPT, SKILL_RAW_URL
+    """The human path is one prompt block to send to an agent.
+
+    Guards the version step and hand-off framing added in PR #1017
+    (follow-up to PRs #1013 and #1014): the prompt tells the agent to
+    upgrade BenchFlow before reading the skill, the upgrade command appears
+    before the skill URL, and the URL sits on one unbroken physical line.
+    README.md renders the prompt as a blockquote (a fenced code block would
+    not soft-wrap on GitHub), so each unwrapped prompt line is asserted to be
+    present in the README instead of the whole string verbatim.
+    """
+    from benchflow.cli.traj import (
+        CONTRIBUTOR_PROMPT,
+        CONTRIBUTOR_PROMPT_FRAMING,
+        SKILL_RAW_URL,
+        UPGRADE_COMMAND,
+    )
 
     result = runner.invoke(app, ["traj", "setup", "--prompt"])
     readme = Path(__file__).resolve().parents[1] / "README.md"
+    readme_text = readme.read_text(encoding="utf-8")
 
     assert result.exit_code == 0, result.output
-    assert CONTRIBUTOR_PROMPT in click.unstyle(result.output)
+    output = click.unstyle(result.output)
+    assert CONTRIBUTOR_PROMPT_FRAMING in output
+    assert CONTRIBUTOR_PROMPT in output
     assert SKILL_RAW_URL in result.output
     assert "bench traj upload" not in result.output
-    assert CONTRIBUTOR_PROMPT in readme.read_text(encoding="utf-8")
+
+    prompt_lines = [line for line in CONTRIBUTOR_PROMPT.splitlines() if line]
+    assert len(prompt_lines) == 3
+    for line in prompt_lines:
+        assert line in readme_text
+    # Wording updated on main in 8cae2a42 ("Send these to your coding agent.").
+    assert "Send these to your coding agent" in readme_text
+
+    assert UPGRADE_COMMAND in CONTRIBUTOR_PROMPT
+    assert CONTRIBUTOR_PROMPT.index(UPGRADE_COMMAND) < CONTRIBUTOR_PROMPT.index(
+        SKILL_RAW_URL
+    )
+    assert any(SKILL_RAW_URL in line for line in prompt_lines)
 
 
 def test_setup_yes_installs_the_skill(
@@ -740,7 +769,9 @@ def test_setup_yes_installs_the_skill(
     assert skill.is_file()
     text = skill.read_text(encoding="utf-8")
     assert "open the viewer" in text
-    assert "Paste this to your agent" in click.unstyle(result.output)
+    # PR #1017 reframed the hand-off copy: the block is a prompt for the
+    # agent, not steps for the human.
+    assert "Send this to your coding agent" in click.unstyle(result.output)
 
 
 def test_list_recent_sessions_scans_all_projects_most_recent_first(