myagent-ai 1.15.78 → 1.15.79

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.79",
   "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:
@@ -1619,7 +1624,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 +1672,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 +1687,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 +1713,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 +1742,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 +1967,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 +2191,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)
@@ -4697,8 +4702,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 +6227,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({