myagent-ai 1.15.78 → 1.15.80

package/agents/main_agent.py

@@ -280,8 +280,9 @@ class MainAgent(BaseAgent):
             return None
 
         from datetime import datetime
+        from core.utils import get_config_tz
         old_time = old_memory.created_at or "未知时间"
-        new_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        new_time = datetime.now(get_config_tz()).strftime("%Y-%m-%d %H:%M:%S")
         user_msg = context.user_message or ""
 
         merge_prompt = f"""你是一个记忆管理系统。现在系统检测到两条高度相似的记忆，请你判断如何合并它们。
@@ -377,7 +378,7 @@ class MainAgent(BaseAgent):
         safe_session = session_id.replace("-", "").replace("/", "_")[:12] if session_id else "default"
         kb_file = auto_kb_dir / f"{safe_session}.md"
 
-        now_str = datetime.now().strftime("%Y-%m-%d %H:%M")
+        now_str = datetime.now(get_config_tz()).strftime("%Y-%m-%d %H:%M")
 
         # 检查重复：与已有文件内容做相似度比较
         existing_content = ""

package/config.py

@@ -150,6 +150,7 @@ class AppConfig:
     log_level: str = "INFO"
     data_dir: str = ""                 # 数据目录，默认 ~/.myagent/
     language: str = "zh-CN"
+    timezone: str = "Asia/Shanghai"     # 时区，用于生成时间戳和提示词中的当前时间
 
 
 # ==============================================================================

package/core/context_builder.py

@@ -191,9 +191,12 @@ class ContextBuilder:
         """
         构建 <datetime> 段落 —— 当前日期时间（精确到秒）。
         让 LLM 知道当前时间，以便给出与时间相关的回答。
+        使用配置的时区，而非系统时区。
         """
+        from core.utils import get_config_tz
         from datetime import datetime
-        now = datetime.now()
+        tz = get_config_tz()
+        now = datetime.now(tz)
         weekdays = ["星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"]
         date_str = now.strftime("%Y年%m月%d日")
         time_str = now.strftime("%H:%M:%S")
@@ -201,7 +204,7 @@ class ContextBuilder:
         return (
             f"<datetime>\n"
             f"当前时间: {date_str} {weekday} {time_str}\n"
-            f"时间戳: {now.timestamp()}\n"
+            f"时区: {tz}\n"
             f"</datetime>"
         )
 

package/core/utils.py

@@ -9,14 +9,30 @@ import uuid
 import time
 import re
 from datetime import datetime, timezone
+from zoneinfo import ZoneInfo
 from typing import Any, Dict, Optional, TypeVar
 
 T = TypeVar("T")
 
+# 时区缓存，避免每次调用都重新解析
+_tz_cache: Optional[ZoneInfo] = None
+
+def get_config_tz() -> ZoneInfo:
+    """获取配置的时区对象（带缓存）"""
+    global _tz_cache
+    if _tz_cache is not None:
+        return _tz_cache
+    try:
+        from config import ConfigManager
+        tz_name = ConfigManager().get("timezone", "Asia/Shanghai")
+        _tz_cache = ZoneInfo(tz_name)
+    except Exception:
+        _tz_cache = ZoneInfo("Asia/Shanghai")
+    return _tz_cache
 
 def timestamp() -> str:
-    """返回 ISO 8601 格式时间戳（本地时间）"""
-    return datetime.now().isoformat()
+    """返回 ISO 8601 格式时间戳（使用配置时区）"""
+    return datetime.now(get_config_tz()).isoformat()
 
 
 def timestamp_ms() -> int:

package/memory/manager.py

@@ -473,7 +473,8 @@ class MemoryManager:
     def add_global(self, session_id="global", key="", content="", summary="", importance=0.7, metadata=None) -> str:
         """添加全局记忆（跨会话可检索）"""
         from datetime import datetime
-        now_str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        from core.utils import get_config_tz
+        now_str = datetime.now(get_config_tz()).strftime("%Y-%m-%d %H:%M:%S")
         ts_summary = summary or truncate_str(content, 200)
         entry = MemoryEntry(
             session_id=session_id, category="global", key=key,
@@ -676,7 +677,7 @@ class MemoryManager:
         try:
             # 解析 ISO 8601 时间戳
             created_dt = datetime.fromisoformat(created_at.replace("Z", "+00:00"))
-            now_dt = datetime.now(created_dt.tzinfo) if created_dt.tzinfo else datetime.now()
+            now_dt = datetime.now(get_config_tz())
 
             age_seconds = (now_dt - created_dt).total_seconds()
             if age_seconds <= 0:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.15.78",
+  "version": "1.15.80",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -18,6 +18,11 @@ from web.tts_handler import synthesize, preprocess_for_tts, AVAILABLE_VOICES
 
 logger = get_logger("myagent.api")
 
+def _now_iso():
+    """返回配置时区的 ISO 时间戳"""
+    from core.utils import get_config_tz
+    return datetime.datetime.now(get_config_tz()).isoformat()
+
 def _safe_load_json(filepath, default=None):
     """安全读取 JSON 文件，解析失败返回默认值"""
     try:
@@ -339,6 +344,8 @@ class ApiServer:
         r.add_post("/api/knowledge/search", self.handle_knowledge_search)
         # ── 配置管理 (热重载/导入/导出) ──
         r.add_get("/api/config", self.handle_get_config)
+        r.add_post("/api/config/get", self.handle_get_config_key)
+        r.add_post("/api/config/set", self.handle_set_config_key)
         r.add_post("/api/config/reload", self.handle_reload_config)
         r.add_post("/api/config/export", self.handle_export_config)
         r.add_post("/api/config/import", self.handle_import_config)
@@ -1619,7 +1626,7 @@ class ApiServer:
         # 迁移后再次检查（损坏文件可能已被删除）
         if not (ad / "config.json").exists():
             ad.mkdir(parents=True, exist_ok=True)
-            now = datetime.datetime.now().isoformat()
+            now = _now_iso()
             cfg = {
                 "id": uuid.uuid4().hex[:12],
                 "name": "全权Agent",
@@ -1667,7 +1674,7 @@ class ApiServer:
             # 其他 agent：创建一个最小 config
             ad = self._agent_dir(path)
             if ad.exists():
-                now = datetime.datetime.now().isoformat()
+                now = _now_iso()
                 cfg = {
                     "id": uuid.uuid4().hex[:12],
                     "name": path,
@@ -1682,7 +1689,7 @@ class ApiServer:
                 logger.info(f"已重建 Agent 配置: {path}")
             return
         changed = False
-        now = datetime.datetime.now().isoformat()
+        now = _now_iso()
         if "id" not in cfg:
             cfg["id"] = uuid.uuid4().hex[:12]
             changed = True
@@ -1708,7 +1715,7 @@ class ApiServer:
         # 迁移后再次检查（损坏文件可能已被删除）
         if not (ad / "config.json").exists():
             ad.mkdir(parents=True, exist_ok=True)
-            now = datetime.datetime.now().isoformat()
+            now = _now_iso()
             cfg = {
                 "id": uuid.uuid4().hex[:12],
                 "name": "配置助手",
@@ -1737,7 +1744,7 @@ class ApiServer:
                 cfg = json.loads((ad / "config.json").read_text(encoding="utf-8"))
                 if cfg.get("system_prompt") != CONFIG_HELPER_PROMPT:
                     cfg["system_prompt"] = CONFIG_HELPER_PROMPT
-                    cfg["updated_at"] = datetime.datetime.now().isoformat()
+                    cfg["updated_at"] = _now_iso()
                     (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
                     logger.info("已同步配置助手最新的系统提示词")
             except Exception as e:
@@ -1962,7 +1969,7 @@ class ApiServer:
         if (ad / "config.json").exists():
             return web.json_response({"error": f"Agent '{name}' already exists"}, status=409)
 
-        now = datetime.datetime.now().isoformat()
+        now = _now_iso()
         cfg = {
             "id": uuid.uuid4().hex[:12],
             "name": name,
@@ -2186,7 +2193,7 @@ class ApiServer:
         if "system" in data:
             del data["system"]
         # 自动更新 updated_at
-        cfg["updated_at"] = datetime.datetime.now().isoformat()
+        cfg["updated_at"] = _now_iso()
         (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
         # 部门变更时同步部门成员列表（old_dept 已在 cfg 修改前保存）
         new_dept = data.get("department", old_dept)
@@ -3316,6 +3323,28 @@ class ApiServer:
         cfg = self.core.config_mgr.get_full_config()
         return web.json_response(cfg)
 
+    async def handle_get_config_key(self, request):
+        """POST /api/config/get - 获取单个配置项"""
+        data = await request.json()
+        key = data.get("key", "")
+        value = getattr(self.core.config, key, None)
+        return web.json_response({"ok": True, "value": value or ""})
+
+    async def handle_set_config_key(self, request):
+        """POST /api/config/set - 设置单个配置项并保存"""
+        data = await request.json()
+        key = data.get("key", "")
+        value = data.get("value", "")
+        if not key:
+            return web.json_response({"ok": False, "error": "缺少 key"})
+        setattr(self.core.config, key, value)
+        self.core.config_mgr.save()
+        # 时区变更时清除缓存，下次调用 get_config_tz() 立即生效
+        if key == "timezone":
+            import core.utils as _u
+            _u._tz_cache = None
+        return web.json_response({"ok": True})
+
     def _build_model_chain(self, agent_cfg: dict | None, agent_path: str) -> list[dict]:
         """构建模型链: [主模型, 备用模型1, 备用模型2, ...]"""
         if not agent_cfg:
@@ -4697,8 +4726,9 @@ class ApiServer:
         include_secrets = data.get("include_secrets", False)
 
         try:
+            from core.utils import get_config_tz
             export_data = self.core.config_mgr.export_config(include_secrets=include_secrets)
-            filename = f"myagent_config_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}.json"
+            filename = f"myagent_config_{datetime.datetime.now(get_config_tz()).strftime('%Y%m%d_%H%M%S')}.json"
 
             resp = web.Response(
                 body=json.dumps(export_data, ensure_ascii=False, indent=2),
@@ -6221,7 +6251,7 @@ class ApiServer:
             self._execution_lock = {
                 "locked": True,
                 "locked_by": agent_path,
-                "locked_at": datetime.datetime.now().isoformat(),
+                "locked_at": _now_iso(),
             }
             logger.info(f"全局执行锁已获取: {agent_path}")
             return web.json_response({

package/web/ui/index.html

@@ -2005,10 +2005,13 @@ async function uploadDeptKB(path,folderMode){
 async function renderSystem(){
   $('content').innerHTML=`
   <div class="card">
-    <h3>🔄 热重载</h3>
-    <p style="font-size:13px;color:var(--text2);margin-bottom:12px">从配置文件重新加载所有设置，立即生效，无需重启服务</p>
-    <button class="btn btn-primary" id="sysReloadBtn" onclick="sysHotReload()">热重载配置</button>
-    <div id="sysReloadMsg"></div>
+    <h3>🕐 时区设置</h3>
+    <p style="font-size:13px;color:var(--text2);margin-bottom:12px">设置系统时区，影响提示词中的当前时间、记忆时间戳、日志时间等所有时间显示</p>
+    <div style="display:flex;align-items:center;gap:12px;margin-bottom:12px">
+      <select id="sysTimezone" style="flex:1;padding:8px 12px;border:1px solid var(--border);border-radius:6px;background:var(--bg2);color:var(--text);font-size:14px"></select>
+      <button class="btn btn-primary" id="sysTzSaveBtn" onclick="sysSaveTimezone()">保存</button>
+    </div>
+    <div id="sysTzMsg"></div>
   </div>
   <div class="card">
     <h3>📤 导出备份</h3>
@@ -2038,31 +2041,38 @@ async function renderSystem(){
     <h3>👁️ 配置预览</h3>
     <div class="config-preview" id="sysConfigPreview">加载中...</div>
   </div>`;
+  sysLoadTimezone();
   sysLoadPreview();
 }
 
-function sysSetMsg(id,type,msg){
-  const el=$(id);if(!el)return;
-  el.className='status-msg '+type;el.textContent=msg;
-  if(type!=='loading')setTimeout(()=>{if(el.className.includes(type))el.className='status-msg';},8000);
+const COMMON_TIMEZONES=['Asia/Shanghai','Asia/Kuala_Lumpur','Asia/Singapore','Asia/Tokyo','Asia/Seoul','Asia/Ho_Chi_Minh','Asia/Bangkok','Asia/Jakarta','Asia/Kolkata','Asia/Dubai','Europe/London','Europe/Paris','Europe/Berlin','Europe/Moscow','America/New_York','America/Chicago','America/Denver','America/Los_Angeles','Australia/Sydney','Pacific/Auckland','UTC'];
+
+async function sysLoadTimezone(){
+  try{
+    const r=await api('/api/config/get',{method:'POST',body:JSON.stringify({key:'timezone'})});
+    const sel=$('sysTimezone');
+    sel.innerHTML=COMMON_TIMEZONES.map(tz=>`<option value="${tz}"${tz===(r.value||'Asia/Shanghai')?' selected':''}>${tz}</option>`).join('');
+  }catch(e){console.error('Load timezone failed:',e);}
 }
 
-async function sysHotReload(){
-  const btn=$('sysReloadBtn');btn.disabled=true;
-  sysSetMsg('sysReloadMsg','loading','正在热重载配置...');
+async function sysSaveTimezone(){
+  const btn=$('sysTzSaveBtn');btn.disabled=true;
+  sysSetMsg('sysTzMsg','loading','正在保存时区...');
   try{
-    const r=await api('/api/config/reload',{method:'POST',body:JSON.stringify({})});
-    if(r.ok){
-      const changes=r.changes||[];
-      let msg='✅ 配置已热重载';
-      msg+=changes.length>0?' — 变更: '+changes.join(', '):' — 无显著变更';
-      sysSetMsg('sysReloadMsg','success',msg);showToast(msg,'success');
-      sysLoadPreview();
-    }else{sysSetMsg('sysReloadMsg','error','❌ 热重载失败: '+(r.error||'未知错误'));}
-  }catch(e){sysSetMsg('sysReloadMsg','error','❌ 热重载失败: '+e.message);}
+    const tz=$('sysTimezone').value;
+    const r=await api('/api/config/set',{method:'POST',body:JSON.stringify({key:'timezone',value:tz})});
+    if(r.ok){sysSetMsg('sysTzMsg','success','✅ 时区已保存为 '+tz);showToast('时区已更新为 '+tz,'success');}
+    else{sysSetMsg('sysTzMsg','error','❌ 保存失败: '+(r.error||'未知错误'));}
+  }catch(e){sysSetMsg('sysTzMsg','error','❌ 保存失败: '+e.message);}
   btn.disabled=false;
 }
 
+function sysSetMsg(id,type,msg){
+  const el=$(id);if(!el)return;
+  el.className='status-msg '+type;el.textContent=msg;
+  if(type!=='loading')setTimeout(()=>{if(el.className.includes(type))el.className='status-msg';},8000);
+}
+
 async function sysExport(includeSecrets){
   const btnId=includeSecrets?'sysExportFull':'sysExportSafe';
   const btn=$(btnId);btn.disabled=true;