From 067d09acf534dafd0bdd19df70d88d6c0612bcfc Mon Sep 17 00:00:00 2001 From: tandem-demo Date: Fri, 6 Nov 2026 10:19:21 +0800 Subject: [PATCH 1/2] refactor(scripts): rename TANDEM_* env vars to JEVDUO_* with a legacy fallback - scripts/run_experiment.sh reads JEVDUO_EXPERIMENT_ROOT / JEVDUO_CONFIG_FILE. The pre-rename TANDEM_* names are still honored but print a deprecation warning on stderr, so a stale variable never silently falls back to the default directory. The new name wins when both are set. - tests: switch the existing cases to JEVDUO_*, add legacy-only and both-set cases. - README upgrade note and docs/CLUSTER_RUNTIME.md document the new names and the transition. --- README.md | 2 +- docs/CLUSTER_RUNTIME.md | 4 +++ scripts/run_experiment.sh | 18 ++++++++-- tests/eval/test_experiment_script.py | 51 +++++++++++++++++++++++++--- 4 files changed, 67 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ebea2f4..243f575 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ jevduo check # 确认入口可用 ``` - 自己的脚本里 `import tandem` / `from tandem_eval ...` 需改为 `jevduo` / `jevduo_eval`。 -- 环境变量 `TANDEM_*` 本次未改名,仍按原名使用。 +- 环境变量 `TANDEM_EXPERIMENT_ROOT` / `TANDEM_CONFIG_FILE` 改名为 `JEVDUO_EXPERIMENT_ROOT` / `JEVDUO_CONFIG_FILE`;旧名作为过渡仍可用(stderr 提示弃用),后续版本移除。 - rjob 任务名前缀由 `tandem-` 变为 `jevduo-`;开发机 `infra/config.json` 里的 `eval.repo_root` / `eval.deploy_root` 需按新目录同步,旧的部署副本确认无在跑任务后再清理。 ## 会话配置 diff --git a/docs/CLUSTER_RUNTIME.md b/docs/CLUSTER_RUNTIME.md index 38ff5b7..1374b46 100644 --- a/docs/CLUSTER_RUNTIME.md +++ b/docs/CLUSTER_RUNTIME.md @@ -332,3 +332,7 @@ worker 侧各段日志: 脚本只同步一次代码,然后按指定并发提交。worker 的 adpc 挂载只读时,结果先落 evobox 暂存,单题完成后立即 rsync 到实验目录。`--dry-run` 只生成 manifest 和 batch log, 不提交 rjob。 + +可选环境变量:`JEVDUO_EXPERIMENT_ROOT` 覆盖实验根目录(默认 `rjob_logs/`), +`JEVDUO_CONFIG_FILE` 覆盖配置文件(默认 `infra/config.json`)。改名前的 `TANDEM_EXPERIMENT_ROOT` / +`TANDEM_CONFIG_FILE` 作为过渡仍可用,会在 stderr 提示弃用,后续版本移除。 diff --git a/scripts/run_experiment.sh b/scripts/run_experiment.sh index 7c11493..41d4936 100755 --- a/scripts/run_experiment.sh +++ b/scripts/run_experiment.sh @@ -27,6 +27,7 @@ Usage: Experiment names use lowercase letters, digits and hyphens only. Artifacts: rjob_logs/NAME/{manifest.json,batch.log,drivers/,NAME-TASK/}. +Env: JEVDUO_EXPERIMENT_ROOT (default rjob_logs), JEVDUO_CONFIG_FILE (default infra/config.json). EOF } @@ -60,7 +61,20 @@ if [[ ! "$EXECUTION_MODE" =~ ^(step|stage|goal)$ || "$STAGE_MAX_ACTIONS" -lt 1 ] exit 2 fi -EXPERIMENT_ROOT="${TANDEM_EXPERIMENT_ROOT:-$REPO/rjob_logs}" +# JEVDUO_* is the current name; TANDEM_* is the pre-rename name, still honored with a warning. +env_or_legacy() { + local name="$1" legacy="$2" default="$3" + if [[ -n "${!name:-}" ]]; then + printf '%s' "${!name}" + elif [[ -n "${!legacy:-}" ]]; then + echo "warning: $legacy is deprecated; use $name instead" >&2 + printf '%s' "${!legacy}" + else + printf '%s' "$default" + fi +} + +EXPERIMENT_ROOT="$(env_or_legacy JEVDUO_EXPERIMENT_ROOT TANDEM_EXPERIMENT_ROOT "$REPO/rjob_logs")" EXPERIMENT_DIR="$EXPERIMENT_ROOT/$EXPERIMENT" DRIVER_DIR="$EXPERIMENT_DIR/drivers" if [[ -e "$EXPERIMENT_DIR/manifest.json" ]]; then @@ -73,7 +87,7 @@ if [[ ! -f infra/config.json && "$DRY_RUN" -ne 1 ]]; then echo "infra/config.json is required for a real run" >&2 exit 4 fi -CONFIG_FILE="${TANDEM_CONFIG_FILE:-infra/config.json}" +CONFIG_FILE="$(env_or_legacy JEVDUO_CONFIG_FILE TANDEM_CONFIG_FILE infra/config.json)" if [[ ! -f "$CONFIG_FILE" ]]; then CONFIG_FILE=infra/config.example.json fi diff --git a/tests/eval/test_experiment_script.py b/tests/eval/test_experiment_script.py index a7cdd9c..5f6ebf6 100644 --- a/tests/eval/test_experiment_script.py +++ b/tests/eval/test_experiment_script.py @@ -9,7 +9,7 @@ def test_dry_run_creates_manifest_and_batch_log(tmp_path): - env = {**os.environ, "TANDEM_EXPERIMENT_ROOT": str(tmp_path)} + env = {**os.environ, "JEVDUO_EXPERIMENT_ROOT": str(tmp_path)} result = subprocess.run( [ "bash", str(SCRIPT), @@ -40,7 +40,7 @@ def test_dry_run_creates_manifest_and_batch_log(tmp_path): def test_invalid_experiment_name_is_rejected(tmp_path): - env = {**os.environ, "TANDEM_EXPERIMENT_ROOT": str(tmp_path)} + env = {**os.environ, "JEVDUO_EXPERIMENT_ROOT": str(tmp_path)} result = subprocess.run( ["bash", str(SCRIPT), "--experiment", "bad name", "--tasks", "024", "--dry-run"], capture_output=True, @@ -56,7 +56,7 @@ def test_dry_run_selects_goal_mode_without_changing_script_default(tmp_path): result = subprocess.run([ "bash", str(SCRIPT), "--experiment", "goal-smoke", "--tasks", "008", "--execution-mode", "goal", "--stage-max-actions", "2", "--dry-run"], capture_output=True, text=True, - env={**os.environ, "TANDEM_EXPERIMENT_ROOT": str(tmp_path)}) + env={**os.environ, "JEVDUO_EXPERIMENT_ROOT": str(tmp_path)}) assert result.returncode == 0, result.stderr manifest = json.loads((tmp_path / "goal-smoke/manifest.json").read_text()) assert manifest["execution_mode"] == "goal" and manifest["stage_max_actions"] == 2 @@ -65,8 +65,8 @@ def test_dry_run_selects_goal_mode_without_changing_script_default(tmp_path): def test_dry_run_uses_example_when_private_config_is_missing(tmp_path): env = { **os.environ, - "TANDEM_EXPERIMENT_ROOT": str(tmp_path), - "TANDEM_CONFIG_FILE": str(tmp_path / "missing.json"), + "JEVDUO_EXPERIMENT_ROOT": str(tmp_path), + "JEVDUO_CONFIG_FILE": str(tmp_path / "missing.json"), } result = subprocess.run( ["bash", str(SCRIPT), "--experiment", "ci-dry-run", "--tasks", "024", "--dry-run"], @@ -76,3 +76,44 @@ def test_dry_run_uses_example_when_private_config_is_missing(tmp_path): ) assert result.returncode == 0, result.stderr assert (tmp_path / "ci-dry-run" / "manifest.json").is_file() + + +def _env_without_overrides(**extra): + """Drop any inherited JEVDUO_*/TANDEM_* so the precedence tests see only what they set.""" + env = {k: v for k, v in os.environ.items() if not k.startswith(("JEVDUO_", "TANDEM_"))} + return {**env, **extra} + + +def test_legacy_tandem_env_vars_still_work_with_deprecation_warning(tmp_path): + env = _env_without_overrides( + TANDEM_EXPERIMENT_ROOT=str(tmp_path), + TANDEM_CONFIG_FILE=str(tmp_path / "missing.json"), + ) + result = subprocess.run( + ["bash", str(SCRIPT), "--experiment", "legacy-env", "--tasks", "024", "--dry-run"], + capture_output=True, + text=True, + env=env, + ) + assert result.returncode == 0, result.stderr + assert (tmp_path / "legacy-env" / "manifest.json").is_file() + assert "TANDEM_EXPERIMENT_ROOT is deprecated; use JEVDUO_EXPERIMENT_ROOT" in result.stderr + assert "TANDEM_CONFIG_FILE is deprecated; use JEVDUO_CONFIG_FILE" in result.stderr + + +def test_jevduo_env_var_takes_precedence_over_legacy(tmp_path): + new_root, old_root = tmp_path / "new", tmp_path / "old" + env = _env_without_overrides( + JEVDUO_EXPERIMENT_ROOT=str(new_root), + TANDEM_EXPERIMENT_ROOT=str(old_root), + ) + result = subprocess.run( + ["bash", str(SCRIPT), "--experiment", "both-env", "--tasks", "024", "--dry-run"], + capture_output=True, + text=True, + env=env, + ) + assert result.returncode == 0, result.stderr + assert (new_root / "both-env" / "manifest.json").is_file() + assert not old_root.exists() + assert "deprecated" not in result.stderr From 6e8ea89bbdad870bb1a86e247ca9452b6592e51d Mon Sep 17 00:00:00 2001 From: tandem-demo Date: Fri, 6 Nov 2026 10:20:04 +0800 Subject: [PATCH 2/2] docs: update brand wording from Tandem to JevDuo - README / AGENTS.md / docs/CLUSTER_RUNTIME.md: title and intro wording - demo: page title, header, eyebrow, player and result-table labels, console tag, build_site.py description, and the two HTTP User-Agent strings - tools/render_summary.py: page title - DEVIATIONS.md: add a naming note at the top; historical entries are kept verbatim Display text only, no behavior change. Still unchanged (follow-up PR): harness.name, the episode.json harness string, the version number and the schema $id/$ref/title. --- AGENTS.md | 4 ++-- DEVIATIONS.md | 3 +++ README.md | 4 ++-- demo/build_site.py | 2 +- demo/fetch_sai_frames.py | 2 +- demo/sync_official.py | 2 +- demo/web/assets/app.css | 2 +- demo/web/assets/app.js | 4 ++-- demo/web/assets/views/browser.js | 6 +++--- demo/web/assets/views/home.js | 2 +- demo/web/assets/views/results.js | 2 +- demo/web/index.html | 4 ++-- docs/CLUSTER_RUNTIME.md | 4 ++-- tools/render_summary.py | 4 ++-- 14 files changed, 24 insertions(+), 21 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 73a91d0..bfb9b1b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,4 +1,4 @@ -# AGENTS.md — Tandem 开发纪律 +# AGENTS.md — JevDuo 开发纪律 本文件是协作与代码合入的硬约束。此前那份仓库外的重构总计划已删除, 改为 **human in the loop 的开发与重构**:改动前先与维护者确认形态与取舍, @@ -6,7 +6,7 @@ ## 仓库定位 -主体是 **Tandem harness**(快慢双模 CUA,`src/jevduo/`);`src/jevduo_eval/` 仅为适配集群 rjob 的测评薄适配层(worker 侧 6 文件 + 开发机侧 rjob.py / rjob_spec.py / rjob_status.py / config_schema.py)。 +主体是 **JevDuo harness**(快慢双模 CUA,`src/jevduo/`);`src/jevduo_eval/` 仅为适配集群 rjob 的测评薄适配层(worker 侧 6 文件 + 开发机侧 rjob.py / rjob_spec.py / rjob_status.py / config_schema.py)。 ## 五条硬纪律(CI/评审强制) diff --git a/DEVIATIONS.md b/DEVIATIONS.md index 4c98776..ac8a0d4 100644 --- a/DEVIATIONS.md +++ b/DEVIATIONS.md @@ -1,5 +1,8 @@ # 与旧仓库(SA-CUAharness,冻结于 main@bc290e3)的已知行为差异 +> 命名说明:项目已由 Tandem 更名为 JevDuo。下文历史条目中的 `tandem` / `tandem_eval` / `src/tandem/` +> 即现在的 `jevduo` / `jevduo_eval` / `src/jevduo/`,条目正文保持原样。 + 人工验收与代码评审对照本清单。按计划 §3.1 有意排除的项标注【计划内】,接口移植中的取舍标注【重构】。 ## M1(planner_led 主路径移植) diff --git a/README.md b/README.md index 243f575..88f27c9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Tandem +# JevDuo **面向 Computer Use 场景的快慢双模 CUA harness。** 慢模型负责**理解与规划**——读长指令、读屏幕、读无障碍树,产出「下一步该做什么」的意图; 快模型(JEV / Kev 这类 System One 决策模型)负责**选择**——在一个已被裁剪过的候选动作空间里, -一次前向就挑出具体动作。Tandem 把这两级拼成一条可评测、可回放、可对比的决策闭环。 +一次前向就挑出具体动作。JevDuo 把这两级拼成一条可评测、可回放、可对比的决策闭环。 ``` 观察 Observation diff --git a/demo/build_site.py b/demo/build_site.py index bc1044a..70bbfe1 100644 --- a/demo/build_site.py +++ b/demo/build_site.py @@ -187,7 +187,7 @@ def build_episodes( def main(argv: list[str] | None = None) -> int: - parser = argparse.ArgumentParser(description="构建 Tandem demo 单页工作台") + parser = argparse.ArgumentParser(description="构建 JevDuo demo 单页工作台") parser.add_argument("--runs-root", type=Path, action="append", default=None, help="结果目录根,可给多次(默认:合并基线清单里的批次)") parser.add_argument("--out", type=Path, default=REPO_ROOT / "demo" / "site") diff --git a/demo/fetch_sai_frames.py b/demo/fetch_sai_frames.py index 4eb7c92..039e981 100644 --- a/demo/fetch_sai_frames.py +++ b/demo/fetch_sai_frames.py @@ -37,7 +37,7 @@ CACHE_DIR = REPO_ROOT / "demo" / ".cache" / "sai_frames" SAI_REPO = "https://huggingface.co/datasets/simular-ai/sai-osworld-v21-reference-runs/resolve/main" -USER_AGENT = "tandem-demo/0.1 (+frame fetch for trajectory comparison)" +USER_AGENT = "jevduo-demo/0.1 (+frame fetch for trajectory comparison)" FRAME_WIDTH = 960 FRAME_QUALITY = 72 diff --git a/demo/sync_official.py b/demo/sync_official.py index 5352e16..e70a009 100644 --- a/demo/sync_official.py +++ b/demo/sync_official.py @@ -38,7 +38,7 @@ SAI_INDEX_URL = f"{SAI_REPO}/index.jsonl" SAI_SCORECARD_URL = f"{SAI_REPO}/scorecard/ref-scorecard.json" -USER_AGENT = "tandem-demo-sync/0.1 (+offline snapshot refresh)" +USER_AGENT = "jevduo-demo-sync/0.1 (+offline snapshot refresh)" def fetch(url: str, *, timeout: int = 120) -> bytes: diff --git a/demo/web/assets/app.css b/demo/web/assets/app.css index df25a8f..1ecc263 100644 --- a/demo/web/assets/app.css +++ b/demo/web/assets/app.css @@ -1,4 +1,4 @@ -/* Tandem demo 工作台 · 设计系统 +/* JevDuo demo 工作台 · 设计系统 * * 一条原则:**少边框、多留白、用字号和色阶分层**,别把信息堆成表格墙。 * 颜色只在这里定义(CSS 变量),组件内禁止硬编码色值;深浅两套主题共用变量名。 diff --git a/demo/web/assets/app.js b/demo/web/assets/app.js index d168b53..7fc7354 100644 --- a/demo/web/assets/app.js +++ b/demo/web/assets/app.js @@ -1,4 +1,4 @@ -/* Tandem demo 工作台 · 应用内核(无框架、无构建、离线可开) +/* JevDuo demo 工作台 · 应用内核(无框架、无构建、离线可开) * * 纪律: * - 不引入任何外部资源(CDN 只作为可选增强,主链路零外链); @@ -74,7 +74,7 @@ window.TD = (function () { if (!view) { // 未知路由:回退到首页,但留一条痕迹(别静默吞掉) if (typeof console !== "undefined" && console.warn) { - console.warn("[tandem-demo] 未知视图:" + current.view + ",回退到首页"); + console.warn("[jevduo-demo] 未知视图:" + current.view + ",回退到首页"); } view = views.home; } diff --git a/demo/web/assets/views/browser.js b/demo/web/assets/views/browser.js index c126d0b..0a90012 100644 --- a/demo/web/assets/views/browser.js +++ b/demo/web/assets/views/browser.js @@ -1,7 +1,7 @@ /* 轨迹浏览:三栏工作台(页面骨架) * * 左:任务卡(首帧预览 + 域 + 得分 + 步数) - * 中:Tandem 与 Sai 两边独立回放,**花费与用时按步骤累计** + * 中:JevDuo 与 Sai 两边独立回放,**花费与用时按步骤累计** * 右:Task Instruction、模型底座、评测(得分 / 步数 / 逐条要求) * * 播放器本身在 browser_player.js(TD.browserPlayer)——拆开是为了让这个文件 @@ -89,7 +89,7 @@ ])); var duo = TD.el("div", { class: "duo" }, [ TD.browserPlayer.player({ - title: "Tandem", + title: "JevDuo", who: "MiniMax-M3.1-Flash + JEV", score: episode && episode.score !== null ? "得分 " + episode.score.toFixed(4) : "", items: episode ? TD.browserPlayer.ourItems(episode) : [] @@ -116,7 +116,7 @@ var scoreBox = TD.el("div", { class: "score-box" }, [ TD.el("div", { class: "score-big", text: row.ours === null ? "—" : (row.ours * 100).toFixed(2) + "%" }), - TD.el("div", { class: "score-sub", text: "Tandem · " + ((episode && episode.steps) || 0) + " 步" }), + TD.el("div", { class: "score-sub", text: "JevDuo · " + ((episode && episode.steps) || 0) + " 步" }), TD.el("div", { class: "score-sub", text: "Sai · " + (row.sai_best === null || row.sai_best === undefined ? "—" : (row.sai_best * 100).toFixed(2) + "%") }) ]); right.appendChild(scoreBox); diff --git a/demo/web/assets/views/home.js b/demo/web/assets/views/home.js index fe0a3dd..d3fa498 100644 --- a/demo/web/assets/views/home.js +++ b/demo/web/assets/views/home.js @@ -10,7 +10,7 @@ /* ------------------------------------------------------------ 1. 简介 */ function intro() { return TD.el("section", { class: "intro" }, [ - TD.el("p", { class: "eyebrow", text: "TANDEM · 快慢双模 CUA HARNESS" }), + TD.el("p", { class: "eyebrow", text: "JEVDUO · 快慢双模 CUA HARNESS" }), TD.el("h1", { class: "intro-title", text: "一个大脑,一个小脑,一起操作电脑" }), TD.el("p", { class: "intro-lede", html: "慢模型负责拆解、规划与纠错;快模型负责在候选空间里挑选动作。" + diff --git a/demo/web/assets/views/results.js b/demo/web/assets/views/results.js index 60783b2..a69f9e9 100644 --- a/demo/web/assets/views/results.js +++ b/demo/web/assets/views/results.js @@ -123,7 +123,7 @@ } var rows = [ - row("Tandem", "MiniMax-M3.1-Flash + JEV", "v2.1", 500, + row("JevDuo", "MiniMax-M3.1-Flash + JEV", "v2.1", 500, (ours.binary_rate_attempted || 0) * 100, (ours.partial_over_dataset || 0) * 100, ours.usd_per_task, true) ]; diff --git a/demo/web/index.html b/demo/web/index.html index 77f5538..a160baa 100644 --- a/demo/web/index.html +++ b/demo/web/index.html @@ -3,7 +3,7 @@ -Tandem Harness · OSWorld 2.1 工作台 +JevDuo Harness · OSWorld 2.1 工作台 @@ -13,7 +13,7 @@
- Tandem + JevDuo