JOJO
ec294e2545
- 输入栏新增运行模式切换器，仅对话空闲可切换，新对话继承当前选择 - plan 档锁定只读权限与沙箱执行环境（UI 禁用+后端强制），网络权限保持可调 - 计划写入 .astrion/plan/，submit_plan 提交后前端弹窗审批，批准自动切换 execute - ask 档直接输出讨论并禁用 ask_user；execute 档自行补全细节直接开工 - 个性化新增默认运行模式（默认 plan），主提示词加运行模式让位注解 - 修复后台命令绕过只读权限的漏洞（宿主机按 sandbox_write_access 选只读沙箱计划） - 计划审批与询问弹窗改用 100dvh 动态视口高度，适配移动端 Safari
99 lines
3.4 KiB
Python
99 lines
3.4 KiB
Python
from __future__ import annotations
|
|
|
|
import threading
|
|
import time
|
|
import uuid
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
# 计划文档内容送进弹窗/记录的最大字符数（超出截断，完整内容始终在计划文件里）
|
|
PLAN_CONTENT_MAX_CHARS = 20000
|
|
|
|
|
|
class PlanApprovalManager:
|
|
"""In-memory manager for plan-mode plan approval requests (submit_plan 工具).
|
|
|
|
与 UserQuestionManager 同构：模型在计划模式下调用 submit_plan 后阻塞等待，
|
|
前端弹窗展示计划文档内容，用户批准（可附意见）或拒绝（附意见）。
|
|
"""
|
|
|
|
def __init__(self):
|
|
self._items: Dict[str, Dict[str, Any]] = {}
|
|
self._lock = threading.Lock()
|
|
|
|
def create_request(
|
|
self,
|
|
*,
|
|
username: str,
|
|
conversation_id: Optional[str],
|
|
task_id: Optional[str],
|
|
tool_call_id: Optional[str],
|
|
plan_file: str,
|
|
plan_content: str,
|
|
summary: Optional[str] = None,
|
|
) -> Dict[str, Any]:
|
|
approval_id = f"plan_approval_{uuid.uuid4().hex}"
|
|
content = str(plan_content or "")
|
|
truncated = False
|
|
if len(content) > PLAN_CONTENT_MAX_CHARS:
|
|
content = content[:PLAN_CONTENT_MAX_CHARS]
|
|
truncated = True
|
|
item = {
|
|
"approval_id": approval_id,
|
|
"username": username,
|
|
"conversation_id": conversation_id,
|
|
"task_id": task_id,
|
|
"tool_call_id": tool_call_id,
|
|
"plan_file": str(plan_file or "").strip(),
|
|
"plan_content": content,
|
|
"plan_content_truncated": truncated,
|
|
"summary": str(summary or "").strip()[:300],
|
|
"status": "pending",
|
|
"created_at": time.time(),
|
|
"resolved_at": None,
|
|
"comment": "",
|
|
}
|
|
with self._lock:
|
|
self._items[approval_id] = item
|
|
return dict(item)
|
|
|
|
def get(self, approval_id: str) -> Optional[Dict[str, Any]]:
|
|
with self._lock:
|
|
item = self._items.get(approval_id)
|
|
return dict(item) if item else None
|
|
|
|
def list_pending(self, username: str, conversation_id: Optional[str] = None) -> List[Dict[str, Any]]:
|
|
with self._lock:
|
|
rows = []
|
|
for item in self._items.values():
|
|
if item.get("username") != username:
|
|
continue
|
|
if item.get("status") != "pending":
|
|
continue
|
|
if conversation_id and item.get("conversation_id") != conversation_id:
|
|
continue
|
|
rows.append(dict(item))
|
|
rows.sort(key=lambda x: x.get("created_at", 0.0))
|
|
return rows
|
|
|
|
def answer(
|
|
self,
|
|
*,
|
|
approval_id: str,
|
|
username: str,
|
|
approved: bool,
|
|
comment: Optional[str] = None,
|
|
) -> Dict[str, Any]:
|
|
clean_comment = str(comment or "").strip()
|
|
with self._lock:
|
|
item = self._items.get(approval_id)
|
|
if not item:
|
|
raise KeyError("计划批准请求不存在")
|
|
if item.get("username") != username:
|
|
raise PermissionError("无权限处理该计划批准请求")
|
|
if item.get("status") != "pending":
|
|
return dict(item)
|
|
item["status"] = "approved" if approved else "rejected"
|
|
item["resolved_at"] = time.time()
|
|
item["comment"] = clean_comment[:2000]
|
|
return dict(item)
|