hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-12 15:23:27 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cap run_command spam and force a usable finalize after tool-round limits.

Browse source 
Budget shell calls like CLI, and when rounds are exhausted inject a no-more-tools system nudge plus any user_facing_hint constraints into the final synthesis pass.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-10 23:26:54 +08:00
parent 28a5f2586c
commit 9d447b1c51
5 changed files with 186 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
runtime/direct_loop.py
View file

@ -1466,6 +1466,7 @@ def run_oclaw_direct_loop(
skill_exec = SkillExecutor(config=ToolExecutionConfig(max_workers=max(1, min(int(max_tool_workers or 8), 32))))
tool_traces: list[dict[str, Any]] = []
user_facing_hints: list[str] = []
final_text = ""
hit_tool_round_limit = False
workspace_lane_role = str(skill_binding_role or wire_policy_role or "generalist").strip().lower() or "generalist"
@ -1644,6 +1645,10 @@ def run_oclaw_direct_loop(
"round": int(round_idx + 1),
}
)
if isinstance(result, dict):
uh = str(result.get("user_facing_hint") or "").strip()
if uh:
user_facing_hints.append(uh)
if on_progress:
on_progress(f"oclaw: tools done ({elapsed_ms}ms)")
@ -1653,11 +1658,21 @@ def run_oclaw_direct_loop(
_check_stop(should_stop)
if on_progress:
on_progress("oclaw: finalize…")
from runtime.tools.tool_error_hints import build_finalize_system_suffix
finalize_suffix = build_finalize_system_suffix(
lang=lang,
hit_tool_round_limit=hit_tool_round_limit,
user_facing_hints=user_facing_hints,
)
finalize_system = str(system_prompt or "")
if finalize_suffix:
finalize_system = f"{finalize_system}\n\n{finalize_suffix}".strip()
msgs = _build_model_context(
store=store,
session_id=session_id,
max_messages=max_messages,
system_prompt=system_prompt,
system_prompt=finalize_system,
model=model,
lang=lang,
memory_context=memory_context,