From bdccf3f90378b593a789cd38d0e42ba97972ef47 Mon Sep 17 00:00:00 2001 From: Simbiot Harness Date: Tue, 29 Sep 2026 17:06:25 +0000 Subject: [PATCH] =?UTF-8?q?fix(timeout):=20tick=5Ftimeout=20=D1=83=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D1=8F=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE?= =?UTF-8?q?=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E=20300=D1=81=20(max=20?= =?UTF-8?q?=D1=81=20every*0.8)=20=E2=80=94=20LLM-=D1=82=D0=B8=D0=BA=20?= =?UTF-8?q?=D1=81=20=D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D0=BC=D0=B8=20=D0=BD=D0=B5=20=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=B7=D0=B0=D0=B5=D1=82=20=D0=B2=20120=D1=81;=20requeue=20?= =?UTF-8?q?=D0=B8=D0=B7=20running=20(=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B2=D0=B8=D1=81=D0=B8=D1=82=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D1=81=D0=BC=D0=B5=D1=80=D1=82=D0=B8=20=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0-=D0=B2=D0=BB=D0=B0=D0=B4=D0=B5=D0=BB=D1=8C=D1=86?= =?UTF-8?q?=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- harness/commands.py | 8 ++++++-- harness/isolated_runner.py | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/harness/commands.py b/harness/commands.py index 4ba93e2..d05e028 100644 --- a/harness/commands.py +++ b/harness/commands.py @@ -97,12 +97,16 @@ def promote_task(task_id: str, reason: str = "manual promote"): def requeue_task(task_id: str, reason: str = "manual requeue"): - """Вернуть failed/прерванную задачу в очередь (TaskPromoted → ready).""" + """Вернуть failed/running/прерванную задачу в очередь (TaskPromoted → ready). + + running тоже возвращаем: если тик-владелец умер (рестарт демона, таймаут), + TaskFailed/TaskCompleted не будет — иначе задача зависает в running навсегда. + """ model = es.run_projections() t = model["tasks"].get(task_id) if t is None: raise ValueError(f"задача {task_id} не найдена") - if t["status"] not in ("failed", "done"): + if t["status"] not in ("failed", "done", "running"): raise ValueError(f"задача {task_id} в статусе {t['status']} — requeue не нужен") es.append_event("task", task_id, "TaskPromoted", {"to": t["size"], "from": t["size"], "reason": reason}) diff --git a/harness/isolated_runner.py b/harness/isolated_runner.py index 4c25152..3784b05 100644 --- a/harness/isolated_runner.py +++ b/harness/isolated_runner.py @@ -39,8 +39,10 @@ def run_llm_tick(level_cfg, prompt: str, session_id=None, trace_prefix=None, tim env = dict(os.environ) env["SIMBIOT_DB"] = env.get("SIMBIOT_DB", os.path.join(_HARNESS_DIR, "harness", "harness.db")) if timeout is None: - # таймаут чуть меньше интервала уровня, чтобы тик не наезжал на границу - timeout = max(120, min(int(level_cfg.every * 0.8), 900)) + # таймаут уровня: тик может быть длиннее интервала — занятый уровень + # просто поглощает такты (TickAbsorbed), это норма архитектуры + timeout = getattr(level_cfg, "tick_timeout", 300) + timeout = max(timeout, int(level_cfg.every * 0.8)) try: proc = subprocess.run( [_VENV_PY, _WORKER],