hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-09 03:30:48 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove plan mode, skill toolcall path, and inline netx tools.

Browse source 
Wave C subtraction: keep skills as prompt-only, route netx via MCP with a shared netx_http client for xlsx/context inject, and delete plan_agent_v2 from the gateway.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-11 01:17:39 +08:00
parent 628a9dffd2
commit efa72df362
40 changed files with 169 additions and 3033 deletions
Download patch file Download diff file Expand all files Collapse all files

84
runtime/gateway.py
View file

@ -1013,90 +1013,6 @@ class OclawGateway:
system_prompt_override = ""
tools_override = None
if interaction_mode == "expert":
from runtime.plan_agent_v2.gateway_adapter import evaluate_gateway_expert_turn_shadow
from runtime.plan_agent_v2.tool_specs import DEFAULT_SESSION_KEY, materialize_plan_mode_v2_tools
execution_mode = str(base_metadata.get("execution_mode") or "agent").strip().lower()
if execution_mode not in {"agent", "plan"}:
execution_mode = "agent"
try:
self.store.set_setting(DEFAULT_SESSION_KEY, str(msg.session_id or ""))
except Exception:
pass
# Respect store setting AIA_EXPERT_PLAN_AGENT_V2_ENABLED (default off); do not force cutover.
shadow = evaluate_gateway_expert_turn_shadow(
store=self.store,
msg=msg,
lang=lang,
interaction_mode=interaction_mode,
requested_specialist=requested_specialist,
execution_mode=execution_mode,
base_system_prompt=str(getattr(selected_executor, "system_prompt", "") or ""),
force_flag=False,
trace_id=trace_id,
parent_span_id=None,
)
if shadow.used_v2 and shadow.decision is not None:
action = str(shadow.decision.action or "")
if action in {"enter_plan", "stay_plan"}:
elapsed_ms = int((time.perf_counter() - t0) * 1000)
_trace_local(
event_type="response_sent",
payload={"ok": True, "elapsed_ms": elapsed_ms, "mode": "sync_direct", "plan_action": action},
started_at=t0,
)
_flush_trace_rows()
return OclawGatewayResult(
run_id=rid,
reply_text=str(shadow.decision.reply_text or ""),
trace_id=trace_id,
elapsed_ms=elapsed_ms,
mode="sync_direct",
selected_specialist=requested_specialist,
interaction_mode=interaction_mode,
dispatch_reason=f"plan_agent_v2:{action}",
manager_selected_specialist=requested_specialist,
requested_specialist=requested_specialist,
dynamic_agent_used=False,
dynamic_agent_name="",
relay_pointer_count=int(relay_stats.get("relay_pointer_count") or 0),
relay_envelope_present=bool(relay_stats.get("relay_envelope_present")),
relay_envelope_pointer_count=int(relay_stats.get("relay_envelope_pointer_count") or 0),
relay_ttl_turn_count=int(ttl_stats.get("turn") or 0),
relay_ttl_session_count=int(ttl_stats.get("session") or 0),
relay_ttl_keep_count=int(ttl_stats.get("keep") or 0),
turn_uuid="",
)
if action == "run_agent":
system_prompt_override = str(shadow.decision.system_prompt_override or "")
exec_tools = getattr(selected_executor, "tools", None)
if isinstance(exec_tools, ToolRegistry):
merged = ToolRegistry(exec_tools.list() + materialize_plan_mode_v2_tools(store=self.store))
tools_override = merged
_trace_local(
event_type="plan_mode_tools_augmented",
payload={"base_count": len(exec_tools.list()), "merged_count": len(merged.list())},
started_at=t0,
)
try:
plan_mode = str((shadow.decision.plan_state or {}).get("mode") or "").strip().lower()
except Exception:
plan_mode = ""
if plan_mode == "plan":
from runtime.plan_agent_v2.tool_policy import filter_tools_for_mode
if isinstance(tools_override, ToolRegistry):
filtered = filter_tools_for_mode(registry=tools_override, mode="plan")
tools_override = ToolRegistry(filtered)
_trace_local(
event_type="plan_mode_tools_filtered",
payload={
"before_count": len(merged.list()) if isinstance(exec_tools, ToolRegistry) else len(filtered),
"after_count": len(filtered),
},
started_at=t0,
)
route_mode = "sync_direct"
route_msg = StandardMessage(