1919 **收尾运行**:波末最后一次运行没过验收、而更早某次运行的结果能全过时,执行体把那次
2020 的代码原样再跑一遍——不占 R2 预算、不计 usage.runs(与节点复跑核对同口径),经同一个
2121 执行器,所以工作区、产物采集、发布代码与指标都回到那一版,下游「最后一次运行」口径不变。
22+ 调用方给了 ``discard_files`` 时,晚于来源运行、失败版新建且复跑没有重新写出的文件在验收
23+ 时当作不存在,复跑通过后交给它删掉——工作区与节点采集里都不再留失败版的文件。
22244. **实现语言由任务卡定,模型无权换(§7.4,H7)**:``SandboxTask.language`` 是 G1
2325 确认下来的语言;执行体把 ``code_run`` 的 ``language`` 固定成它——模型漏传就补上,
2426 传了别的语言就退回一条观察(不执行、不计预算);语言不是 python 时 ``python_run``
3335from __future__ import annotations
3436
3537import json
38+ import posixpath
3639import re
37- from collections .abc import Callable , Mapping , Sequence
40+ from collections .abc import Callable , Collection , Iterable , Mapping , Sequence
3841from dataclasses import dataclass , field , replace
3942from typing import Any
4043
41- from omm_agent_core .models import ToolResult
44+ from omm_agent_core .models import ArtifactRef , ToolResult
4245
4346from .budget import LoopBudget
4447from .context import ContextAssembler , Section
6770#: 两个名字都算「一次沙箱运行」:R2 预算、证据采集、最终代码回收一视同仁。
6871RUN_TOOL_NAMES = frozenset ({PYTHON_TOOL_NAME , CODE_RUN_TOOL_NAME })
6972
73+ #: 工作区写文件工具名(与 omm_agent_tools 的 ws_write 一致):收尾清理要知道模型在哪次运行
74+ #: 之后新建过哪些文件。
75+ _WS_WRITE_TOOL = "ws_write"
76+
7077#: 任务卡缺省实现语言(python_run 时代的唯一语言;方案卡 language 缺省也是它)。
7178DEFAULT_LANGUAGE = "python"
7279
@@ -224,6 +231,57 @@ class _RunRecord:
224231 result : ToolResult
225232
226233
234+ @dataclass (frozen = True )
235+ class _Writes :
236+ """一次真执行(模型运行 / 收尾复跑)或一次 ws_write 在工作区里留下的痕迹:新建、写过(含新建)、
237+ 删掉的工作区相对路径,以及运行报上来的产物。"""
238+
239+ created : frozenset [str ] = frozenset ()
240+ written : frozenset [str ] = frozenset ()
241+ deleted : frozenset [str ] = frozenset ()
242+ artifacts : tuple [ArtifactRef , ...] = ()
243+
244+
245+ def _workspace_path (value : Any ) -> str :
246+ """工作区相对路径归一:反斜杠换成 /、去掉 ./ 与重复分隔(ws_write 的 path 是模型原样给的)。"""
247+ text = str (value or "" ).strip ().replace ("\\ " , "/" )
248+ normalized = posixpath .normpath (text ) if text else ""
249+ return "" if normalized in {"" , "." } else normalized
250+
251+
252+ def _path_set (value : Any ) -> frozenset [str ]:
253+ if not isinstance (value , (list , tuple )):
254+ return frozenset ()
255+ return frozenset (path for path in map (_workspace_path , value ) if path )
256+
257+
258+ def _run_writes (result : ToolResult ) -> _Writes :
259+ """执行器报上来的本次新建 / 改写 / 删掉的路径(tools 的 created_files 等,缺席当作没有)。"""
260+ output = result .output or {}
261+ created = _path_set (output .get ("created_files" ))
262+ return _Writes (
263+ created = created ,
264+ written = created | _path_set (output .get ("modified_files" )),
265+ deleted = _path_set (output .get ("deleted_files" )),
266+ artifacts = tuple (result .artifacts ),
267+ )
268+
269+
270+ def _basename (path : str ) -> str :
271+ return path .replace ("\\ " , "/" ).rstrip ("/" ).rsplit ("/" , 1 )[- 1 ]
272+
273+
274+ def _hiding (read_text : Callable [[str ], str ], gone : frozenset [str ]) -> Callable [[str ], str ]:
275+ """读文件时把 ``gone`` 里的路径当作不存在(收尾验收不许靠失败版留下的文件)。"""
276+
277+ def read (path : str ) -> str :
278+ if _workspace_path (path ) in gone :
279+ raise FileNotFoundError (path )
280+ return read_text (path )
281+
282+ return read
283+
284+
227285class _RunTracker :
228286 """沙箱运行(python_run / code_run)的预算、语言路由与证据跟踪:包装注入的工具执行器。
229287
@@ -232,7 +290,9 @@ class _RunTracker:
232290 python 却调 python_run → 退回观察(不执行、不计预算);
233291 - 证据采集:记录最后一次运行的代码/结果、每次模型运行的记录与全部产物 id;
234292 - 观察加注:回给模型的那份附运行预算,失败的另附 stderr / stdout 尾部(原始结果照存);
235- - 收尾运行(:meth:`finalize`):原样重跑某次模型运行,不计 ``runs``。
293+ - 收尾运行(:meth:`finalize`):原样重跑某次模型运行,不计 ``runs``;
294+ - 收尾清理:按执行顺序记下每次真执行与 ws_write 新建 / 写过 / 删掉的路径,
295+ :meth:`leftovers` 据此找出晚于来源运行、失败版留下的文件。
236296 """
237297
238298 def __init__ (
@@ -257,6 +317,9 @@ def __init__(
257317 self .history : list [_RunRecord ] = []
258318 #: 已被拿来收尾过的模型运行(history 下标):每次运行最多收尾一次
259319 self .finalized_from : set [int ] = set ()
320+ #: 执行时间线(模型运行、收尾复跑、ws_write 按发生顺序)与模型运行在其中的位置
321+ self ._timeline : list [_Writes ] = []
322+ self ._positions : list [int ] = []
260323
261324 def _route (self , call : ToolCall ) -> ToolCall | ToolResult :
262325 """把一次运行调用钉在任务卡语言上;违约返回失败观察而不是改写模型的意图。"""
@@ -292,7 +355,11 @@ def __call__(self, calls: Sequence[ToolCall]) -> Sequence[ToolResult]:
292355 results : list [ToolResult ] = []
293356 for call in calls :
294357 if call .name not in RUN_TOOL_NAMES :
295- results .extend (self ._inner ([call ]))
358+ passed_through = list (self ._inner ([call ]))
359+ if call .name == _WS_WRITE_TOOL :
360+ for result in passed_through :
361+ self ._note_ws_write (call , result )
362+ results .extend (passed_through )
296363 continue
297364 routed = self ._route (call )
298365 if isinstance (routed , ToolResult ):
@@ -310,6 +377,7 @@ def __call__(self, calls: Sequence[ToolCall]) -> Sequence[ToolResult]:
310377 continue
311378 self .runs += 1
312379 outcome = self ._execute (routed )
380+ self ._positions .append (len (self ._timeline ) - 1 )
313381 self .history .append (_RunRecord (call = routed , result = outcome ))
314382 results .append (self ._observed (outcome ))
315383 return results
@@ -319,10 +387,53 @@ def finalize(self, index: int) -> ToolResult:
319387 self .finalized_from .add (index )
320388 return self ._execute (self .history [index ].call )
321389
390+ def leftovers (self , source : int , * , rerun_done : bool = True ) -> dict [str , list [str ]]:
391+ """晚于 ``history[source]`` 的执行新建、收尾复跑没有重新写出的路径 → 它们报上来的产物 id。
392+
393+ ``rerun_done`` 为 False 是挑来源时的预估:复跑还没跑,按那次运行自己写过的路径算。
394+ 来源运行(含)之前写过的路径不算——那时它就在工作区里;来源运行之后被删过的路径也不算——
395+ 可能是原本就在、被失败运行删掉又重建的文件,宁可留着。
396+ """
397+ position = self ._positions [source ]
398+ if rerun_done :
399+ later , rerun = self ._timeline [position + 1 : - 1 ], self ._timeline [- 1 ].written
400+ else :
401+ later , rerun = self ._timeline [position + 1 :], self ._timeline [position ].written
402+ keep = set (rerun )
403+ for entry in self ._timeline [: position + 1 ]:
404+ keep |= entry .written
405+ for entry in later :
406+ keep |= entry .deleted
407+ paths = sorted ({path for entry in later for path in entry .created } - keep )
408+ return {
409+ path : [
410+ ref .artifact_id
411+ for entry in later
412+ if path in entry .written
413+ for ref in entry .artifacts
414+ if _basename (ref .uri ) == _basename (path )
415+ ]
416+ for path in paths
417+ }
418+
419+ def forget (self , artifact_ids : Iterable [str ]) -> None :
420+ """删掉的文件报过的产物不再参与「最后一次运行的那份」(指标来源);报告里的全量产物照列。"""
421+ for artifact_id in artifact_ids :
422+ self .artifact_names .pop (artifact_id , None )
423+
424+ def _note_ws_write (self , call : ToolCall , result : ToolResult ) -> None :
425+ output = result .output or {}
426+ path = _workspace_path (output .get ("path" ) or call .arguments .get ("path" ))
427+ if not result .ok or not path :
428+ return
429+ created = frozenset ({path }) if output .get ("created" ) else frozenset ()
430+ self ._timeline .append (_Writes (created = created , written = frozenset ({path })))
431+
322432 def _execute (self , call : ToolCall ) -> ToolResult :
323433 self .last_code = str (call .arguments .get ("code" ) or "" )
324434 outcome = list (self ._inner ([call ]))[0 ]
325435 self .last_result = outcome
436+ self ._timeline .append (_run_writes (outcome ))
326437 for ref in outcome .artifacts :
327438 self .artifact_ids .append (ref .artifact_id )
328439 # 先删后插:同一 id 再报一次也排到最后(「最后一次运行的那份」按插入序取)
@@ -448,6 +559,7 @@ def run_sandbox_task(
448559 normalize_language : Callable [[Any ], str ] | None = None ,
449560 on_loop_exit : Callable [[LoopOutcome ], None ] | None = None ,
450561 on_finalize : Callable [[int ], None ] | None = None ,
562+ discard_files : Callable [[Mapping [str , Sequence [str ]]], Sequence [str ]] | None = None ,
451563) -> dict [str , Any ]:
452564 """驱动一张任务卡到 sandbox-run-report.v1 形状的报告 dict。
453565
@@ -471,6 +583,11 @@ def run_sandbox_task(
471583 ``on_finalize`` 在收尾运行开跑前回传被复跑的是第几次模型运行(从 1 数),
472584 父节点据此给执行轨迹补一句说明(那次运行没有模型旁白)。
473585
586+ ``discard_files`` 给了就开收尾清理:晚于来源运行、失败版新建(运行写出或模型 ws_write)且
587+ 复跑没有重新写出的文件,在挑来源与复跑后的重评里都当作不存在(通过不能靠它们);复跑通过后
588+ 以「路径 → 它们报过的产物 id」交给它删,它回传真删掉的路径,这些产物不再当指标来源。复跑
589+ 没过就进下一波,模型还要接着改,文件不动。
590+
474591 ``normalize_language`` 是语言别名归一(python3 → python、Rscript → r …),由
475592 调用方注入以与方案卡 / 执行器同一张表;缺省只做小写去空白。
476593 """
@@ -486,11 +603,14 @@ def run_sandbox_task(
486603 waves = 0
487604 final_answer : dict [str , Any ] | None = None
488605
489- def evidence_of (result : ToolResult | None , files : Sequence [str ]) -> SandboxEvidence :
606+ def evidence_of (
607+ result : ToolResult | None , files : Sequence [str ], hidden : Collection [str ] = ()
608+ ) -> SandboxEvidence :
490609 stdout = str ((result .output or {}).get ("stdout" ) or "" ) if result is not None else ""
610+ gone = frozenset (hidden )
491611 return SandboxEvidence (
492- files = tuple (files ),
493- read_text = read_text ,
612+ files = tuple (path for path in files if _workspace_path ( path ) not in gone ),
613+ read_text = _hiding ( read_text , gone ) if gone else read_text ,
494614 last_run = result ,
495615 stdout = stdout ,
496616 metrics = _extract_metrics (stdout ),
@@ -506,14 +626,21 @@ def finalize() -> tuple[list[dict[str, Any]], bool, int] | None:
506626 record = tracker .history [index ]
507627 if index in tracker .finalized_from or record .result is tracker .last_result :
508628 continue
509- if _evaluate (task , evidence_of (record .result , files ))[1 ]:
629+ predicted = (
630+ tracker .leftovers (index , rerun_done = False ) if discard_files is not None else {}
631+ )
632+ if _evaluate (task , evidence_of (record .result , files , predicted ))[1 ]:
510633 break
511634 else :
512635 return None
513636 if on_finalize is not None :
514637 on_finalize (index + 1 )
515638 tracker .finalize (index )
516- results , ok = _evaluate (task , evidence ())
639+ stale = tracker .leftovers (index ) if discard_files is not None else {}
640+ results , ok = _evaluate (task , evidence_of (tracker .last_result , workspace_files (), stale ))
641+ if ok and stale and discard_files is not None :
642+ removed = discard_files (stale )
643+ tracker .forget (artifact_id for path in removed for artifact_id in stale .get (path , ()))
517644 return results , ok , index
518645
519646 passed = False
0 commit comments