diff --git a/backend/src/main/java/run/webup/platform/AgentWorker.java b/backend/src/main/java/run/webup/platform/AgentWorker.java index dde793d..a9a632f 100644 --- a/backend/src/main/java/run/webup/platform/AgentWorker.java +++ b/backend/src/main/java/run/webup/platform/AgentWorker.java @@ -159,11 +159,6 @@ public class AgentWorker { tasks.finish(id, lease, "PAUSED", "用户暂停,预算继续保留", false); return; } - if (((Number) task.get("step_count")).intValue() - >= ((Number) task.get("max_steps")).intValue()) { - tasks.finish(id, lease, "PAUSED", "达到步骤上限,请核对当前项目进度", false); - return; - } if (tasks.remaining(reservation).compareTo(bound) < 0) { tasks.finish(id, lease, "PAUSED", "剩余预算不足以覆盖一次最坏情况下的调用,请取消后调整预算重新发起", false); return; diff --git a/backend/src/main/java/run/webup/platform/TaskService.java b/backend/src/main/java/run/webup/platform/TaskService.java index 2f639e5..b3bd975 100644 --- a/backend/src/main/java/run/webup/platform/TaskService.java +++ b/backend/src/main/java/run/webup/platform/TaskService.java @@ -429,10 +429,7 @@ public class TaskService { if (action.equals("cancel") && (stopping || status.equals("CANCELLED"))) return find(id, user); if (stopping) throw new ApiError.Failure(409, "任务正在停止"); if (action.equals("resume") && status.equals("PAUSED")) { - db.update( - "UPDATE ai_tasks SET status='QUEUED',error='',requested_action='',max_steps=CASE WHEN" - + " max_steps<=step_count THEN step_count+30 ELSE max_steps END WHERE id=?", - id); + db.update("UPDATE ai_tasks SET status='QUEUED',error='',requested_action='' WHERE id=?", id); event(id, "QUEUED", "用户继续任务"); } else if (action.equals("pause") && (status.equals("QUEUED") || status.equals("RUNNING"))) { if (status.equals("QUEUED")) db.update("UPDATE ai_tasks SET status='PAUSED' WHERE id=?", id); diff --git a/backend/src/test/java/run/webup/platform/AgentWorkerIntegrationTest.java b/backend/src/test/java/run/webup/platform/AgentWorkerIntegrationTest.java index 0b6fcd2..f6b5819 100644 --- a/backend/src/test/java/run/webup/platform/AgentWorkerIntegrationTest.java +++ b/backend/src/test/java/run/webup/platform/AgentWorkerIntegrationTest.java @@ -357,6 +357,37 @@ class AgentWorkerIntegrationTest { verify(sandbox).execute(eq(project), argThat(call -> call.name().equals("write_file"))); } + @Test + void legacyStepLimitPauseCanResumeAndRunMoreThanThirtyAdditionalRounds() throws Exception { + UUID id = + (UUID) + tasks + .create( + user, project, model, "Finish build", new BigDecimal("20"), "legacy-step-cap") + .get("id"); + users + .db() + .update( + "UPDATE ai_tasks SET step_count=60,max_steps=60,status='PAUSED',error=? WHERE id=?", + "达到步骤上限,请核对当前项目进度", + id); + tasks.action(id, user, "resume"); + + var toolResponse = response("Check the build", "run_command"); + var finalResponse = response("Build done", null); + var rounds = new java.util.concurrent.atomic.AtomicInteger(); + when(transport.request(anyString(), anyString(), anyString(), anyString(), anyInt(), any())) + .thenAnswer(call -> rounds.incrementAndGet() <= 31 ? toolResponse : finalResponse); + when(sandbox.execute(any(), any())).thenReturn("{\"exitCode\":0}"); + + new AgentWorker(tasks, gateway, sandbox, vault, json).run(tasks.claim()); + + var task = tasks.config(id); + assertEquals("COMPLETED", task.get("status")); + assertEquals(92, ((Number) task.get("step_count")).intValue()); + verify(sandbox, times(31)).execute(eq(project), any()); + } + @Test void oversizedHistoryResumesAndCompactsAgainWithoutReplayingToolsOrLosingLogs() throws Exception { String prompt = "Continue building the existing site"; diff --git a/backend/src/test/java/run/webup/platform/WalletTaskIntegrationTest.java b/backend/src/test/java/run/webup/platform/WalletTaskIntegrationTest.java index 5e8f698..817336d 100644 --- a/backend/src/test/java/run/webup/platform/WalletTaskIntegrationTest.java +++ b/backend/src/test/java/run/webup/platform/WalletTaskIntegrationTest.java @@ -162,9 +162,7 @@ class WalletTaskIntegrationTest { UUID id = task(); tasks.action(id, user, "pause"); assertEquals("PAUSED", tasks.find(id, user).get("status")); - identity.db().update("UPDATE ai_tasks SET step_count=30 WHERE id=?", id); - tasks.action(id, user, "resume"); - assertEquals(60, ((Number) tasks.find(id, user).get("max_steps")).intValue()); + assertEquals("QUEUED", tasks.action(id, user, "resume").get("status")); tasks.action(id, user, "cancel"); assertEquals("CANCELLED", tasks.find(id, user).get("status")); assertEquals(0, BigDecimal.ZERO.compareTo((BigDecimal) wallets.get(user).get("reserved"))); diff --git a/docs/AI-DEVELOPMENT.md b/docs/AI-DEVELOPMENT.md index ab358e8..98828aa 100644 --- a/docs/AI-DEVELOPMENT.md +++ b/docs/AI-DEVELOPMENT.md @@ -38,7 +38,7 @@ HTTP 客户端禁用重定向和自动重试;实际 DNS 解析连接时拒绝 Worker 以条件更新原子领取任务,持有 300 秒租约;调用模型前与每个工具操作前续租。租约过期不自动重放不确定请求。网络超时、工具结果未知和缺少 usage 会保留剩余预算并转为人工核对。财务管理员核对上游账单和工作区后可补充结算并释放预留,操作单独记录,不伪装为精确 Token 结算。 -默认每次运行最多 30 轮,达到轮次上限后可继续执行最多 30 轮,仍受预算约束。每轮最多 8 个工具,终端命令最长 120 秒。历史接近模型窗口时,Worker 保存交接摘要,在同一任务内开启下一段模型对话。新对话带上项目要求、本轮用户需求和历史进度摘要,继续使用原工作区及预算。摘要从已有消息和工具结果提取,无需单独调用模型。原始消息和日志仍可查询,已执行的工具不会重放。旧版因上下文暂停的任务可以直接继续。 +任务按预算执行,没有固定轮次上限。每轮最多 8 个工具,终端命令最长 120 秒。历史接近模型窗口时,Worker 保存交接摘要,在同一任务内开启下一段模型对话。新对话带上项目要求、本轮用户需求和历史进度摘要,继续使用原工作区及预算。摘要从已有消息和工具结果提取,无需单独调用模型。原始消息和日志仍可查询,已执行的工具不会重放。旧版因轮次或上下文上限暂停的任务可以直接继续。 供应商明确拒绝过长输入且未返回 usage 时,可在仍有旧历史的情况下压缩后重试。超时等无法确定计费状态的错误走核算流程。供应商的实际上下文和输出限制仍适用。后续任务复制最近完成任务的消息,项目文件持久保存在对应 PVC。