fix: 岗位会商 handoff 将上游产物镜像到当前席位沙箱

席位线程隔离导致下游 read_file 找不到上游路径;镜像到 workspace/upstream 并改写 handoff 引用,附带安全路径校验与 SQL 回退测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
董宏凯andCursor committed 2026-08-27 18:35:17 +08:00
1 parent 440b490b0d
commit 32e509b2b3
3 files changed
+238 -7

No files matched your search

@@ -46,6 +46,17 @@ NODE_STATUSES = {"locked", "ready", "running", "done", "stale", "rejected", "err
_HANDOFF_TEXT_BUDGET = 12_000
_MAX_INLINE_ARTIFACTS_PER_NODE = 4
_MAX_INLINE_ARTIFACT_CHARS = 1_800
# Upstream deliverables are additionally mirrored into the current seat's own
# workspace (outputs/<rel> → workspace/upstream/<rel>) before each turn. Every
# seat runs on an isolated LangGraph thread, so without this copy a downstream
# ``read_file`` on the upstream artifact path fails with "File not found" and
# the seat is limited to the short excerpt inlined into the handoff prompt.
# The mirror deliberately stays outside outputs/ so it never appears in this
# seat's own delivery manifest.
_UPSTREAM_MIRROR_PREFIX = "mnt/user-data/workspace/upstream"
_MAX_MIRRORED_ARTIFACTS = 8
_MAX_MIRRORED_ARTIFACT_BYTES = 2_000_000
_MIRRORED_TOTAL_BYTES = 8_000_000
# The handoff prompt remains intentionally small, but the recovery copy stored
# in SQL must retain a complete normal Markdown/JSON deliverable. The ceiling
# protects the database from an accidental multi-gigabyte log while covering
@@ -685,6 +696,11 @@ def _build_node_context_text(
continue
artifact_name = artifact.get("name") or artifact.get("path") or "未命名产物"
lines.append(f" - {artifact_name}")
if artifact.get("mirrored_to_sandbox") and artifact.get("path"):
lines.append(
f" 完整文件已同步到本席位沙箱 /{artifact['path']},可直接用 read_file 读取全文"
"(仅供参考;本席位自己的交付物仍必须写入 /mnt/user-data/outputs/)。"
)
content = str(artifact.get("content") or "").strip()
if content:
lines.append(f" 摘要/正文片段:{content}")
@@ -824,6 +840,95 @@ async def _artifact_refs_with_content(
return refs, consumed
def _outputs_relative_path(value: Any) -> str:
"""Return the ``outputs/``-relative posix path of a manifest artifact.
Empty string when the path is not a plain file directly under
``mnt/user-data/outputs/`` (wrong prefix, traversal segment, ...).
"""
path = str(value or "").replace("\\", "/").lstrip("/")
prefix = "mnt/user-data/outputs/"
if not path.startswith(prefix):
return ""
relative = path[len(prefix) :]
if not relative:
return ""
segments = relative.split("/")
if any(segment in ("", ".", "..") for segment in segments):
return ""
return relative
def _mirror_virtual_path(relative: str) -> str:
return f"{_UPSTREAM_MIRROR_PREFIX}/{relative}"
async def _mirror_upstream_artifacts(
current: dict[str, Any],
upstream_candidates: list[dict[str, Any]],
) -> dict[str, str]:
"""Copy upstream deliverables into the current seat's workspace sandbox.
Bytes are preferred from the upstream thread's own sandbox file; the SQL
recovery copy persisted in the manifest is the fallback when that disk is
gone. Only server-recorded upstream threads and manifest paths that pass
:func:`_outputs_relative_path` are read, and the target resolves through
the same thread virtual-path resolver, so a client-supplied manifest can
never point the copy outside a thread's user-data directory. Idempotent
per turn: an identically sized mirror is left untouched. Best effort —
failures simply keep the excerpt-only handoff behaviour.
"""
target_thread_id = str(current.get("thread_id") or "")
if not target_thread_id or not upstream_candidates:
return {}
mirrored: dict[str, str] = {}
total_bytes = 0
for node in upstream_candidates:
source_thread_id = str(node.get("thread_id") or "")
for artifact in node.get("artifact_manifest") or []:
if len(mirrored) >= _MAX_MIRRORED_ARTIFACTS or total_bytes >= _MIRRORED_TOTAL_BYTES:
return mirrored
if not isinstance(artifact, dict):
continue
original = str(artifact.get("path") or "")
relative = _outputs_relative_path(original)
if not relative:
continue
try:
payload: bytes | None = None
if source_thread_id:
source_path = await aresolve_thread_virtual_path(source_thread_id, original)
if await asyncio.to_thread(source_path.is_file):
stat = await asyncio.to_thread(source_path.stat)
if stat.st_size > _MAX_MIRRORED_ARTIFACT_BYTES:
continue
payload = await asyncio.to_thread(source_path.read_bytes)
if payload is None:
content = artifact.get("content")
if not isinstance(content, str) or not content:
continue
payload = content.encode("utf-8")
if len(payload) > _MAX_MIRRORED_ARTIFACT_BYTES:
continue
mirror_virtual = _mirror_virtual_path(relative)
target_path = await aresolve_thread_virtual_path(target_thread_id, mirror_virtual)
if not (
await asyncio.to_thread(target_path.is_file)
and (await asyncio.to_thread(target_path.stat)).st_size == len(payload)
):
await asyncio.to_thread(target_path.parent.mkdir, parents=True, exist_ok=True)
await asyncio.to_thread(target_path.write_bytes, payload)
mirrored[original] = mirror_virtual
total_bytes += len(payload)
except (HTTPException, OSError, ValueError):
# The upstream file may have been removed, or a provider may be
# unavailable. Skip it; the inline excerpt still carries the
# essential content into the handoff.
continue
return mirrored
async def _handoff_context(request: Request, session_id: str, node_key: str) -> dict[str, Any]:
"""Construct bounded, deterministic hidden context for one direct-agent turn."""
store = _get_store(request)
@@ -877,6 +982,20 @@ async def _handoff_context(request: Request, session_id: str, node_key: str) ->
)
if remaining <= 0:
break
# Point each artifact ref at the workspace mirror when one exists: the
# agent then reads a path that is actually resolvable inside its own
# thread sandbox instead of the upstream thread's outputs directory.
mirrored_paths = await _mirror_upstream_artifacts(current, upstream_candidates)
for node in upstream_nodes:
for artifact in node.get("artifacts") or []:
mirror = mirrored_paths.get(str(artifact.get("path") or ""))
if not mirror:
continue
artifact["upstream_path"] = artifact["path"]
artifact["path"] = mirror
artifact["mirrored_to_sandbox"] = True
return {
"kind": "position_roundtable_handoff",
"instructions": _build_node_context_text(