Merge remote-tracking branch 'upstream/main' into codex/fix-project-uninstall-shared-state-20261011

Signed-off-by: Duang777 <duangjl007@gmail.com>

Author: Duang777

benchmark/LHTB/scripts/preflight.py

@@ -27,6 +27,14 @@
 EXPECTED_AGENT = "benchmark.runtime.harbor:BenchmarkCodex"
 
 
+def cli_supports_replan_count(help_text: str, option: str, count: int) -> bool:
+    """Check the resolved cadence against the current CLI's advertised choices."""
+    choices = re.search(rf"(?<![\w-]){re.escape(option)}\s+\{{([0-9, ]+)\}}", help_text)
+    return choices is not None and count in {
+        int(value.strip()) for value in choices[1].split(",")
+    }
+
+
 def command(argv: list[str], timeout: int = 30) -> tuple[int, str]:
     try:
         result = subprocess.run(
@@ -222,7 +230,7 @@ def check(label: str, passed: bool, detail: str) -> None:
                 field, option, count = candidate._replan_configuration()
                 check(
                     "resolved replan cadence CLI",
-                    rc == 0 and f"{option} {{1,2,3,4,5}}" in help_text,
+                    rc == 0 and cli_supports_replan_count(help_text, option, count),
                     f"{field}={count}",
                 )
                 replan_receipt = candidate._replan_receipt()

benchmark/tests/test_lhtb_preflight.py

@@ -0,0 +1,34 @@
+"""The preflight accepts only cadence values supported by the owning CLI."""
+from __future__ import annotations
+
+import subprocess
+import sys
+
+import pytest
+
+from benchmark.LHTB.scripts.preflight import cli_supports_replan_count
+from benchmark.runtime.codex import DEFAULT_REPLAN_AFTER_TURNS
+
+
+@pytest.mark.parametrize("help_text,option,count,expected", [
+    ("--execution-replan-after-turns {1,2,3,4,5,6}", "--execution-replan-after-turns", 6, True),
+    ("--execution-replan-after-turns {1,2,3,4,5,6}", "--execution-replan-after-turns", 3, True),
+    ("--execution-replan-after-turns {1,2,3,4,5}", "--execution-replan-after-turns", 6, False),
+    ("--execution-replan-after-todos {1,2,3,4,5}", "--execution-replan-after-todos", 3, True),
+    ("--execution-replan-after-todos {1,2,3,4,5}", "--execution-replan-after-todos", 6, False),
+    ("--execution-replan-after-turns\n  {1,2,3,4,5,6}", "--execution-replan-after-turns", 6, True),
+    ("--execution-replan-after-turns-extra {1,2,3,4,5,6}", "--execution-replan-after-turns", 6, False),
+    ("--execution-replan-after-turns {1,2,3,4,5,6}", "--execution-replan-after-todos", 3, False),
+])
+def test_resolved_cadence_uses_its_own_cli_choices(help_text, option, count, expected):
+    assert cli_supports_replan_count(help_text, option, count) is expected
+
+
+def test_current_cli_accepts_the_benchmark_default():
+    help_result = subprocess.run(
+        [sys.executable, "-m", "loopx.cli", "configure-goal", "--help"],
+        capture_output=True, text=True, check=True, timeout=30,
+    )
+    assert cli_supports_replan_count(
+        help_result.stdout, "--execution-replan-after-turns", DEFAULT_REPLAN_AFTER_TURNS,
+    )

docs/architecture/rfcs/README.md

@@ -101,7 +101,7 @@ failure leaves the generated files untouched.
 - [LoopX Overall Roadmap v0](loopx-overall-roadmap-v0.md)
   ([中文版](loopx-overall-roadmap-v0.zh-CN.md))
   - **Delivery on `main`:** Planning and audit evidence, not runtime promotion.
-  - **Current boundary:** Maps all 30 pre-existing primary RFCs and important
+  - **Current boundary:** Maps every primary RFC and important
     non-RFC domains into 13 streams, G0–G5 product milestones and R1–R7 core
     execution cards. Covers product, multi-LoopX-Agent collaboration/handoff,
     kernel, hosts, memory, cost, security, operations, research, releases,
@@ -422,6 +422,15 @@ failure leaves the generated files untouched.
     Lark operation cards. Direct Goal workspace navigation and Overview compose
     bounded graph/acceptance readback, source navigation and snapshot export. General cross-channel disclosure,
     living documents and governed amendment/settlement review remain open.
+- [Goal Workspace Surface v0](goal-workspace-surface-v0.md)
+  ([中文版](goal-workspace-surface-v0.zh-CN.md))
+  - **Delivery on `main`:** Proposal only; Overview, Tasks, Chat, Files, the W1
+    map, usage, acceptance readback and lifecycle stop ship as separate regions.
+  - **Current boundary:** Owns one Goal page's composition and the display
+    semantics of its vitals: persistent masthead with scoped Stop, window- and
+    coverage-labeled figures, work grouped by owner, all-work rail, shared
+    selection and since-last-look delta. M1 requires first-screen preview
+    approval. No new authority, Todo field, lifetime usage or Lark parity.
 - [Live Team Workspace v0](live-team-workspace-v0.md)
   ([中文版](live-team-workspace-v0.zh-CN.md))
   - **Delivery on `main`:** Design proposal only; no live team-stream qualification.

docs/architecture/rfcs/STATUS.md

@@ -18,7 +18,7 @@ appendix may keep dated history, but no dated log heading may precede it.
 
 [中文版](STATUS.zh-CN.md) is the semantic mirror of this file.
 
-## Accepted (43)
+## Accepted (44)
 
 | RFC | Header status | Supersedes / closes | Ledger |
 | --- | --- | --- | --- |
@@ -42,6 +42,7 @@ appendix may keep dated history, but no dated log heading may precede it.
 | [Goal Instance Identity and Orphan Recovery (v0)](goal-instance-identity-and-orphan-recovery-v0.md) | Accepted | none | — |
 | [RFC: Goal-scoped Capability Portfolio and Connector Lifecycle (v0)](goal-scoped-capability-portfolio-v0.md) | Accepted | none | — |
 | [RFC: Per-Goal Usage, Token, and Cost Surfacing v0](goal-usage-token-cost-v0.md) | Accepted | none | — |
+| [RFC: Goal Workspace Surface v0](goal-workspace-surface-v0.md) | Accepted | none | — |
 | [DSH / Pi: L1 Observation and Managed Runtime Selection](harness-selection-dsh-pi-v0.md) | Accepted | none | — |
 | [RFC: Hierarchical Agent Stride Control v0](hierarchical-agent-stride-control-v0.md) | Accepted | none | — |
 | [RFC: Human Attention Wishlist v0](human-attention-wishlist-v0.md) | Accepted | none | — |

docs/architecture/rfcs/STATUS.zh-CN.md

@@ -15,7 +15,7 @@
 
 [English](STATUS.md) 与本文互为语义镜像。
 
-## 已接受 (43)
+## 已接受 (44)
 
 | RFC | 头部状态 | 替代 / 关闭 | Ledger |
 | --- | --- | --- | --- |
@@ -39,6 +39,7 @@
 | [Goal 实例身份与孤儿状态恢复（v0）](goal-instance-identity-and-orphan-recovery-v0.zh-CN.md) | 已接受 | 无 | — |
 | [RFC：Goal 级能力组合与 Connector 生命周期（v0）](goal-scoped-capability-portfolio-v0.zh-CN.md) | 已接受 | 无 | — |
 | [RFC: Per-Goal Usage, Token, and Cost Surfacing v0](goal-usage-token-cost-v0.md) | 已接受 | none | — |
+| [RFC：Goal 工作区页面 v0](goal-workspace-surface-v0.zh-CN.md) | 已接受 | 无 | — |
 | [DSH / Pi：L1 观察与 Managed Runtime 选型](harness-selection-dsh-pi-v0.zh-CN.md) | 已接受 | 无 | — |
 | [RFC：长程 Agent 分层步幅控制 v0](hierarchical-agent-stride-control-v0.zh-CN.md) | 已接受 | 无 | — |
 | [RFC：Human Attention Wishlist v0](human-attention-wishlist-v0.zh-CN.md) | 已接受 | 无 | — |

docs/architecture/rfcs/assets/goal-workspace-surface-v0/goal-workspace-dark.jpg

@@ -191,6 +191,11 @@ The slice must prove:
 4. Whether to add a dedicated `/usage.json` endpoint or continue surfacing
    through the existing status payload (this RFC assumes the latter).
 5. The duration capture anchor — which run boundary events delimit wall-time.
+6. Lifetime and coverage. The [Goal workspace](goal-workspace-surface-v0.md)
+   vitals show window-labeled cost and Agent time (its D2/D4). Should this owner
+   add an aggregate since Goal creation, with retention disclosure, and an
+   explicit field for measured versus observed runtimes? Until then consumers
+   must not sum windows into a lifetime figure or render absent cost as zero.
 
 ## Public References