JOJO/agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(web): persist thinking mode per conversation

Browse Source
This commit is contained in:
JOJO 2025-11-18 10:45:17 +08:00
parent 041c79f3b7
commit d809ec7136
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/web_terminal.py
View File

@ -132,10 +132,17 @@ class WebTerminal(MainTerminal):
try: try:
success = self.context_manager.load_conversation_by_id(conversation_id) success = self.context_manager.load_conversation_by_id(conversation_id)
if success: if success:
# 重置相关状态 # 根据对话元数据同步思考模式
if self.thinking_mode: try:
conv_data = self.context_manager.conversation_manager.load_conversation(conversation_id) or {}
meta = conv_data.get("metadata", {}) or {}
mode = bool(meta.get("thinking_mode", self.thinking_mode))
self.thinking_mode = mode
self.api_client.thinking_mode = mode
self.api_client.start_new_task() self.api_client.start_new_task()
except Exception:
pass
# 重置相关状态
self.current_session_id += 1 self.current_session_id += 1
# 获取对话信息 # 获取对话信息

3
utils/context_manager.py
View File

@ -370,7 +370,8 @@ class ContextManager:
conversation_id=self.current_conversation_id, conversation_id=self.current_conversation_id,
messages=self.conversation_history, messages=self.conversation_history,
project_path=str(self.project_path), project_path=str(self.project_path),
todo_list=self.todo_list todo_list=self.todo_list,
thinking_mode=getattr(self.main_terminal, "thinking_mode", None) if hasattr(self, "main_terminal") else None
) )
if success: if success:

23
web_server.py
View File

@ -280,6 +280,16 @@ def ensure_conversation_loaded(terminal: WebTerminal, conversation_id: Optional[
load_result = terminal.load_conversation(conversation_id) load_result = terminal.load_conversation(conversation_id)
if not load_result.get("success"): if not load_result.get("success"):
raise RuntimeError(load_result.get("message", "对话加载失败")) raise RuntimeError(load_result.get("message", "对话加载失败"))
# 切换到对话记录的思考模式
try:
conv_data = terminal.context_manager.conversation_manager.load_conversation(conversation_id) or {}
meta = conv_data.get("metadata", {}) or {}
mode = bool(meta.get("thinking_mode", terminal.thinking_mode))
terminal.thinking_mode = mode
terminal.api_client.thinking_mode = mode
terminal.api_client.start_new_task()
except Exception:
pass
return conversation_id, created_new return conversation_id, created_new
def reset_system_state(terminal: Optional[WebTerminal]): def reset_system_state(terminal: Optional[WebTerminal]):
@ -509,6 +519,19 @@ def update_thinking_mode(terminal: WebTerminal, workspace: UserWorkspace, userna
terminal.api_client.thinking_mode = desired_mode terminal.api_client.thinking_mode = desired_mode
terminal.api_client.start_new_task() terminal.api_client.start_new_task()
session['thinking_mode'] = desired_mode session['thinking_mode'] = desired_mode
# 更新当前对话的元数据
ctx = terminal.context_manager
if ctx.current_conversation_id:
try:
ctx.conversation_manager.save_conversation(
conversation_id=ctx.current_conversation_id,
messages=ctx.conversation_history,
project_path=str(ctx.project_path),
todo_list=ctx.todo_list,
thinking_mode=desired_mode
)
except Exception as exc:
print(f"[API] 保存思考模式到对话失败: {exc}")
status = terminal.get_status() status = terminal.get_status()
socketio.emit('status_update', status, room=f"user_{username}") socketio.emit('status_update', status, room=f"user_{username}")