benchflow 0.7.2.dev1982__py3-none-any.whl → 0.7.2.dev1986__py3-none-any.whl

benchflow/cli/traj.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import json
 import os
 import shutil
 import subprocess
@@ -29,6 +30,7 @@ from benchflow.publish.traj_capture import (
     stage_trajectory_artifacts,
     validate_email,
     validate_github_id,
+    validate_source_id,
 )
 from benchflow.publish.traj_report import (
     DEFAULT_PREVIEW_STEPS,
@@ -127,6 +129,7 @@ class _UploadOptions:
     github_id: str | None
     email: str | None
     source_id: str | None
+    repo: bool
     direct: bool
     container_url: str | None
     dry_run: bool
@@ -223,6 +226,14 @@ def register_traj(app: typer.Typer) -> None:
             str | None,
             typer.Option("--source-id", help="Stable contributor source identifier"),
         ] = None,
+        repo: Annotated[
+            bool,
+            typer.Option(
+                "--repo/--no-repo",
+                help="Tag the upload with the session's repository "
+                "(owner/name from its git remote) as the source id",
+            ),
+        ] = True,
         direct: Annotated[
             bool,
             typer.Option("--direct", help="Upload with local Azure credentials"),
@@ -254,6 +265,7 @@ def register_traj(app: typer.Typer) -> None:
                     github_id=github_id,
                     email=email,
                     source_id=source_id,
+                    repo=repo,
                     direct=direct,
                     container_url=container_url,
                     dry_run=dry_run,
@@ -268,7 +280,17 @@ def register_traj(app: typer.Typer) -> None:
 def _run_upload(options: _UploadOptions) -> None:
     prompted = options.path is None
     path = options.path or _prompt_for_path()
-    source_id = options.source_id or default_source_id(path)
+    repo_slug: str | None = None
+    if options.source_id is not None:
+        source_id = options.source_id
+    else:
+        if options.repo:
+            repo_slug = _detect_repo_slug(path)
+        source_id = f"repo/{repo_slug}" if repo_slug else default_source_id(path)
+    if repo_slug:
+        # Contributor-visible metadata: surface the tag so private-repo
+        # sessions can opt out before anything leaves the machine.
+        console.print(f"Repo: {repo_slug} (use --no-repo to omit)")
     destination = _resolve_destination(options)
 
     with (
@@ -381,6 +403,92 @@ def _infer_email() -> str:
     return ""
 
 
+_SESSION_CWD_SCAN_LINES = 50
+
+
+def _detect_repo_slug(path: Path) -> str | None:
+    """Best-effort ``owner/name`` for the repository the session was about.
+
+    Reads the working directory the session recorded (Claude events carry a
+    ``cwd`` field; Codex ``session_meta`` payloads do too), asks that
+    directory's git for the ``origin`` remote, and falls back to the
+    invocation directory. Every failure is silent — repo tagging must never
+    break an upload — and local-path remotes never produce a tag, so no
+    local absolute path can leak into the manifest.
+    """
+    for candidate in (_session_cwd(path), Path.cwd()):
+        if candidate is None or not candidate.is_dir():
+            continue
+        remote = _command_stdout(
+            "git", "-C", str(candidate), "remote", "get-url", "origin"
+        )
+        slug = _repo_slug_from_remote(remote) if remote else None
+        if slug:
+            return slug
+    return None
+
+
+def _session_cwd(path: Path) -> Path | None:
+    """Working directory recorded by the first session event that has one."""
+    session = path.expanduser()
+    if not session.is_file():
+        return None
+    try:
+        with session.open(encoding="utf-8", errors="replace") as stream:
+            for line_number, line in enumerate(stream):
+                if line_number >= _SESSION_CWD_SCAN_LINES:
+                    break
+                body = line.strip()
+                if not body:
+                    continue
+                try:
+                    event = json.loads(body)
+                except json.JSONDecodeError:
+                    continue
+                if not isinstance(event, dict):
+                    continue
+                cwd = event.get("cwd")
+                if isinstance(cwd, str) and cwd:
+                    return Path(cwd)
+                payload = event.get("payload")
+                if (
+                    event.get("type") == "session_meta"
+                    and isinstance(payload, dict)
+                    and isinstance(payload.get("cwd"), str)
+                    and payload["cwd"]
+                ):
+                    return Path(payload["cwd"])
+    except OSError:
+        return None
+    return None
+
+
+def _repo_slug_from_remote(remote: str) -> str | None:
+    """Normalize an https/ssh git remote URL to ``owner/name``.
+
+    Only URL-shaped remotes qualify; a filesystem-path remote returns
+    ``None`` so local paths never enter the uploaded source id.
+    """
+    value = remote.strip()
+    if "://" in value:
+        _, _, rest = value.partition("://")
+        _, _, repo_path = rest.partition("/")
+    elif ":" in value and "@" in value.partition(":")[0]:
+        repo_path = value.partition(":")[2]
+    else:
+        return None
+    repo_path = repo_path.strip("/").removesuffix(".git")
+    segments = [segment for segment in repo_path.split("/") if segment]
+    if len(segments) < 2:
+        return None
+    slug = f"{segments[-2]}/{segments[-1]}"
+    try:
+        validate_source_id(f"repo/{slug}")
+    except ValueError:
+        return None
+    return slug
+
+
 def _git_config(key: str) -> str | None:
     return _command_stdout("git", "config", "--get", key)
 

{benchflow-0.7.2.dev1982.dist-info → benchflow-0.7.2.dev1986.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: benchflow
-Version: 0.7.2.dev1982
+Version: 0.7.2.dev1986
 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

{benchflow-0.7.2.dev1982.dist-info → benchflow-0.7.2.dev1986.dist-info}/RECORD

@@ -116,7 +116,7 @@ benchflow/cli/skills.py,sha256=2Apv1iqvmstWEhY6O-PRdxKc8RYwR6f7MvbYfl2dWm0,7497
 benchflow/cli/tasks.py,sha256=b1XP1EZ79ZtK_1shF65qZyv27EcKKFZYV35M4DzxYKI,18534
 benchflow/cli/trace_import.py,sha256=NHDieFdiKQ-2Sr1-GF8Z5EDcbGsz2qq_kFE0rXacC2o,14705
 benchflow/cli/train.py,sha256=MIP_JxptitH348bWWURpcWt-TmDAw1s8d-RUU7jBaIg,23635
-benchflow/cli/traj.py,sha256=PYA7Rc04v9nJpltujFDxMBrCanz3Xgp7on8noAv5rA0,19810
+benchflow/cli/traj.py,sha256=2QlXCLNywIKsm8uQVsQ1TAEnaafV6b0dfLx37O2wEsU,23691
 benchflow/continue_run/__init__.py,sha256=dWidng7kJphVUtbP1a1Ma0Lyjxj5yLgQZIApaKCJUew,1479
 benchflow/continue_run/batch.py,sha256=8BNSInyp_Ol6Fcrg4ezBJdi3cBS12nC8mf963_x4fIg,4146
 benchflow/continue_run/orchestrator.py,sha256=wYoseBNE_rZ0EjNwWDyqfave54xNRe43sCd_O4VJjyk,27676
@@ -292,8 +292,8 @@ benchflow/trajectories/tree.py,sha256=c0jyoP9OurDQq-zRtPc66edzWUvLGwQQz0jgtyqSw2
 benchflow/trajectories/trl_sft_tokenization.py,sha256=-Ef0bP9cuzfzOz5nIv2mEF3taQIEw68h6SM1YO-Mwn4,8643
 benchflow/trajectories/types.py,sha256=aSJclec3dOCUlfFNDL8GfzvkAcBo5r-dvlHE0MnGdMo,27554
 benchflow/trajectories/viewer.py,sha256=59wr8pcWWsCYzuI_sFzTSFJFHeXzH6Yklrh8UsF1ksg,26561
-benchflow-0.7.2.dev1982.dist-info/METADATA,sha256=JicuzeLyLkPazFxU7P9550DdQK68KOhp54WcuRSr-8I,15261
-benchflow-0.7.2.dev1982.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-benchflow-0.7.2.dev1982.dist-info/entry_points.txt,sha256=qPMBVtH4qz3P4nMALEAdTbvpxvsVch9RhqshZKQn1dE,84
-benchflow-0.7.2.dev1982.dist-info/licenses/LICENSE,sha256=ohnbHkuBylrTtOvaZJk9Hz7dRwmaEEGAb5ZcBV4Xuhw,10779
-benchflow-0.7.2.dev1982.dist-info/RECORD,,
+benchflow-0.7.2.dev1986.dist-info/METADATA,sha256=D7gO4mBmAwaKA5_bFHpuy2Hu2_vfMEBQLdPfVoCyFEk,15261
+benchflow-0.7.2.dev1986.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+benchflow-0.7.2.dev1986.dist-info/entry_points.txt,sha256=qPMBVtH4qz3P4nMALEAdTbvpxvsVch9RhqshZKQn1dE,84
+benchflow-0.7.2.dev1986.dist-info/licenses/LICENSE,sha256=ohnbHkuBylrTtOvaZJk9Hz7dRwmaEEGAb5ZcBV4Xuhw,10779
+benchflow-0.7.2.dev1986.dist-info/RECORD,,