mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-10 20:50:52 +08:00
Simplify oclaw product surface: drop niche specialists and admin noise.
Remove stock/image/video specialists, Gmail watcher, CocoLoop market, desktop packaging, and extra memory plugins; disable dynamic agents and hide Session Monitor / API grants / Admin Audit from nav. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
efa72df362
commit
cf31fd104d
290 changed files with 127 additions and 64576 deletions
|
|
@ -10,7 +10,6 @@ from dataclasses import dataclass
|
|||
from pathlib import Path
|
||||
from typing import Any, Callable, Optional
|
||||
|
||||
from runtime.agents.factory import build_ephemeral_executor
|
||||
from runtime.hooks.eligibility_from_metadata import hook_eligibility_from_message_metadata
|
||||
from runtime.hooks_runtime import (
|
||||
get_active_hooks_config,
|
||||
|
|
@ -90,8 +89,7 @@ class OclawGatewayResult:
|
|||
relay_ttl_turn_count: int = 0
|
||||
relay_ttl_session_count: int = 0
|
||||
relay_ttl_keep_count: int = 0
|
||||
# agent-core 本轮 ``chat_message.turn_uuid``；供 WS 收尾与落库兜底对齐
|
||||
turn_uuid: str = ""
|
||||
# agent-core 譛ｬ霓ｮ ``chat_message.turn_uuid``<60>帑ｾ<E5B891> WS 謾ｶ蟆ｾ荳手誠蠎灘<E8A08E>蠎募ｯｹ鮨? turn_uuid: str = ""
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
|
|
@ -209,7 +207,7 @@ class OclawGateway:
|
|||
# - stage "3": renamed on third user message (final)
|
||||
if stage_raw == "3":
|
||||
return
|
||||
if (cur_title not in ("新会话", "New Chat")) and (stage_raw != "1"):
|
||||
if (cur_title not in ("譁ｰ莨夊ｯ?, "New Chat")) and (stage_raw != "1"):
|
||||
return
|
||||
try:
|
||||
rows = self.store.get_messages(session_id=sid, limit=200)
|
||||
|
|
@ -271,7 +269,7 @@ class OclawGateway:
|
|||
if not sess:
|
||||
return
|
||||
cur_title = str(getattr(sess, "title", "") or "").strip()
|
||||
if cur_title not in ("新会话", "New Chat"):
|
||||
if cur_title not in ("譁ｰ莨夊ｯ?, "New Chat"):
|
||||
return
|
||||
try:
|
||||
rows = self.store.get_messages(session_id=sid, limit=20)
|
||||
|
|
@ -405,9 +403,9 @@ class OclawGateway:
|
|||
user_text = (
|
||||
"请基于以下信息输出最终答复。\n\n"
|
||||
f"原始用户问题:\n{str(msg.text or '').strip()}\n\n"
|
||||
f"已调用专家: {str(specialist or '').strip()}\n\n"
|
||||
f"蟾ｲ隹<EFBFBD>畑荳灘ｮ? {str(specialist or '').strip()}\n\n"
|
||||
f"专家结果:\n{str(specialist_reply or '').strip()}\n\n"
|
||||
"要求：保持简洁、准确，不要暴露内部流程。"
|
||||
"隕∵ｱゑｼ壻ｿ晄戟邂豢√∝㊥遑ｮ<EFBFBD>御ｸ崎ｦ∵垓髴ｲ蜀<EFBFBD>Κ豬∫ｨ九?
|
||||
)
|
||||
messages = [{"role": "system", "content": manager_context}, {"role": "user", "content": user_text}]
|
||||
ensure_no_tool_or_embedded_image_payload(messages=messages, path="gateway.manager_finalize")
|
||||
|
|
@ -537,9 +535,9 @@ class OclawGateway:
|
|||
"If you need more rows/details, use database tools (`query_tabular_attachment` / `run_tabular_sql`) with table_id."
|
||||
)
|
||||
return (
|
||||
f"对于大表附件：当前上下文只提供前{preview_rows}行预览。"
|
||||
f"单次读取上限为{max_rows_read}行。"
|
||||
"如果需要更多行或更细节，请通过数据库工具（`query_tabular_attachment` / `run_tabular_sql`）结合 table_id 查询。"
|
||||
f"蟇ｹ莠主､ｧ陦ｨ髯<EFBFBD>ｻｶ<EFBFBD>壼ｽ灘燕荳贋ｸ区枚蜿ｪ謠蝉ｾ帛燕{preview_rows}陦碁｢<EFBFBD>ｧ医?
|
||||
f"蜊墓ｬ｡隸ｻ蜿紋ｸ企剞荳ｺ{max_rows_read}陦後?
|
||||
"螯よ棡髴隕∵峩螟夊｡梧<EFBFBD>譖ｴ扈<EFBFBD>鰍<EFBFBD>瑚ｯｷ騾夊ｿ<EFBFBD>焚謐ｮ蠎灘ｷ･蜈ｷ<EFBFBD><EFBFBD>query_tabular_attachment` / `run_tabular_sql`<60>臥ｻ灘<EFBDBB>?table_id 譟･隸｢縲?
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -550,8 +548,8 @@ class OclawGateway:
|
|||
"For detailed evidence, use `query_text_attachment` with `text_id` from `text_ref` attachment."
|
||||
)
|
||||
return (
|
||||
"对于长文本附件：上下文可能只包含摘要/预览。"
|
||||
"如需细节证据，请使用 `text_ref` 提供的 text_id 调用 `query_text_attachment`。"
|
||||
"蟇ｹ莠朱柄譁<EFBFBD>悽髯<EFBFBD>ｻｶ<EFBFBD>壻ｸ贋ｸ区枚蜿ｯ閭ｽ蜿ｪ蛹<EFBFBD>性鞫倩ｦ<EFBFBD>/鬚<>ｧ医?
|
||||
"螯る怙扈<EFBFBD>鰍隸∵紺<EFBFBD>瑚ｯｷ菴ｿ逕ｨ `text_ref` 謠蝉ｾ帷<EFBDBE>?text_id 隹<>畑 `query_text_attachment`縲?
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -562,7 +560,7 @@ class OclawGateway:
|
|||
"for OCR/description when visual evidence is required."
|
||||
)
|
||||
return (
|
||||
"对于图片附件：如需 OCR 或图像细节，请使用 attachment_id 调用 `query_image_attachment`。"
|
||||
"蟇ｹ莠主崟迚<EFBFBD>刋莉ｶ<EFBFBD>壼ｦる怙 OCR 謌門崟蜒冗ｻ<E58697>鰍<EFBFBD>瑚ｯｷ菴ｿ逕?attachment_id 隹<>畑 `query_image_attachment`縲?
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -572,7 +570,7 @@ class OclawGateway:
|
|||
"For video attachments: use `query_video_attachment` with attachment_id from `video_ref` "
|
||||
"to get metadata or transcript (if enabled)."
|
||||
)
|
||||
return "对于视频附件：请使用 `video_ref` 提供的 attachment_id 调用 `query_video_attachment` 获取元信息/转写。"
|
||||
return "蟇ｹ莠手ｧ<EFBFBD>｢鷹刋莉ｶ<EFBFBD>夊ｯｷ菴ｿ逕ｨ `video_ref` 謠蝉ｾ帷<EFBDBE>?attachment_id 隹<>畑 `query_video_attachment` 闔ｷ蜿門<E89CBF>菫｡諱?霓ｬ蜀吶?
|
||||
|
||||
@staticmethod
|
||||
def _tabular_limits_from_config() -> dict[str, int]:
|
||||
|
|
@ -980,36 +978,23 @@ class OclawGateway:
|
|||
attachments=list(msg.attachments or []),
|
||||
metadata=dict(base_metadata),
|
||||
)
|
||||
if manager_specialist in {"ops", "generalist", "image", "memory", "video"}:
|
||||
if manager_specialist in {"ops", "generalist", "memory"}:
|
||||
if callable(specialist_executor_factory):
|
||||
try:
|
||||
selected_executor = specialist_executor_factory(manager_specialist)
|
||||
except Exception:
|
||||
selected_executor = executor
|
||||
dispatch_reason = "manager_factory_failed"
|
||||
elif dynamic_agent:
|
||||
try:
|
||||
selected_executor = build_ephemeral_executor(
|
||||
self.store,
|
||||
lang=lang,
|
||||
system_prompt=str(dynamic_agent.get("system_prompt") or ""),
|
||||
tool_policy=dict(dynamic_agent.get("tool_policy") or {}),
|
||||
viewer_user_id=msg.user_id,
|
||||
viewer_tenant_id=msg.tenant_id,
|
||||
policy_session_id=msg.session_id,
|
||||
path_policy_tenant_id=msg.tenant_id,
|
||||
path_policy_user_id=msg.user_id,
|
||||
)
|
||||
manager_specialist = str(dynamic_agent.get("name") or "dynamic_ephemeral")
|
||||
dispatch_reason = str(dynamic_agent.get("reason") or "dynamic_agent_selected")
|
||||
except Exception:
|
||||
manager_specialist = "generalist"
|
||||
dispatch_reason = "dynamic_agent_build_failed"
|
||||
if callable(specialist_executor_factory):
|
||||
try:
|
||||
selected_executor = specialist_executor_factory("generalist")
|
||||
except Exception:
|
||||
selected_executor = executor
|
||||
else:
|
||||
# Dynamic ephemeral agents removed from product surface; fall back to generalist.
|
||||
manager_specialist = "generalist"
|
||||
dispatch_reason = "dynamic_agent_disabled_fallback"
|
||||
if callable(specialist_executor_factory):
|
||||
try:
|
||||
selected_executor = specialist_executor_factory("generalist")
|
||||
except Exception:
|
||||
selected_executor = executor
|
||||
dynamic_agent = None
|
||||
|
||||
system_prompt_override = ""
|
||||
tools_override = None
|
||||
|
|
@ -1047,7 +1032,7 @@ class OclawGateway:
|
|||
started_at=t0,
|
||||
)
|
||||
if on_progress:
|
||||
on_progress("oclaw: running…")
|
||||
on_progress("oclaw: running窶?)
|
||||
if route_mode == "async_task":
|
||||
worker_id = ensure_worker_started(store=self.store)
|
||||
task = self.store.oclaw_task_create(
|
||||
|
|
@ -1246,7 +1231,7 @@ class OclawGateway:
|
|||
reply = str(specialist_reply or "").strip()
|
||||
else:
|
||||
reply = (
|
||||
"抱歉，我暂时无法给出可展示的结果，请稍后再试。"
|
||||
"謚ｱ豁会ｼ梧<EFBFBD>證よ慮譌<EFBFBD>豕慕ｻ吝<EFBFBD>蜿ｯ螻慕､ｺ逧<EFBFBD>ｻ捺棡<EFBFBD>瑚ｯｷ遞榊錘蜀崎ｯ輔?
|
||||
if not str(lang or "").startswith("en")
|
||||
else "Sorry, no user-safe result is available right now. Please try again later."
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue