@aiyiran/myclaw 1.1.88 → 1.1.89

package/assets/myclaw-artifacts.js

@@ -2355,9 +2355,8 @@
 
     var deployBtn = document.createElement('button');
     deployBtn.textContent = '⬇创建 -> 训练场';
-    deployBtn.style.cssText = _btnMuted;
-    deployBtn.onmouseenter = function () { deployBtn.style.background = 'rgba(167,139,250,0.22)'; };
-    deployBtn.onmouseleave = function () { deployBtn.style.background = 'rgba(167,139,250,0.12)'; };
+    deployBtn.disabled = true;
+    deployBtn.style.cssText = _btnBase + 'background:rgba(255,255,255,0.05);border:1px solid rgba(255,255,255,0.1);color:rgba(205,214,244,0.3);cursor:not-allowed;';
 
     var copyLocalBtn = document.createElement('button');
     copyLocalBtn.textContent = '⬇创建 -> 新伙伴';
@@ -2382,9 +2381,9 @@
     var footerStatus = document.createElement('span');
     footerStatus.style.cssText = 'font-size:11px;color:rgba(205,214,244,0.45);flex:1;';
 
-    rightFooter.appendChild(deployBtn);
     rightFooter.appendChild(copyLocalBtn);
     rightFooter.appendChild(promptBtn);
+    rightFooter.appendChild(deployBtn);
     rightFooter.appendChild(footerStatus);
 
     // currentTpl 在 setActive 时更新，按钮 onclick 通过闭包读取

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.1.88",
+  "version": "1.1.89",
   "description": "",
   "main": "index.js",
   "bin": {

package/server/sync_workspace.py

@@ -65,6 +65,9 @@ HISTORY_FILENAME = "history.json"
 _rollback_suppressed: dict = {}
 _ROLLBACK_SUPPRESS_TTL = 3.0  # 秒
 
+# 时间窗口合并：同一文件在此时间窗口内的多次变更只保留最新快照（覆盖，不新增版本）
+_HISTORY_MERGE_WINDOW = 20.0  # 秒
+
 
 def _is_rollback_suppressed(abs_path: str) -> bool:
     ts = _rollback_suppressed.get(abs_path)
@@ -94,36 +97,70 @@ def save_history_version(workspace_id: str, relative_path: str, file_path: str):
 
     history_data = _load_history_json(history_json_path, workspace_id)
 
-    next_ver = history_data.get("next_version", 1)
-    ver_dir_name = f"v{next_ver}"
+    # 检查该文件最后一次快照是否在合并窗口内
+    now_ts = time.time()
+    records = history_data.get("records", [])
+    last_record = next(
+        (r for r in reversed(records) if r.get("path") == relative_path),
+        None
+    )
+
+    if last_record:
+        try:
+            last_ts = datetime.fromisoformat(last_record["snapshot_at"]).timestamp()
+        except Exception:
+            last_ts = 0
+        within_window = (now_ts - last_ts) < _HISTORY_MERGE_WINDOW
+    else:
+        within_window = False
 
-    # 复制当前文件内容到 __history__/vN/<relative_path>
     rel_parts = relative_path.replace("\\", "/").split("/")
-    dest_path = os.path.join(history_base, ver_dir_name, *rel_parts)
-    os.makedirs(os.path.dirname(dest_path), exist_ok=True)
-    try:
-        with open(file_path, "rb") as src, open(dest_path, "wb") as dst:
-            dst.write(src.read())
-    except Exception as e:
-        print(f"[history] 快照写入失败: {e}")
-        return
 
-    # 更新 next_version、records、current_versions
-    history_data["next_version"] = next_ver + 1
-    history_data["records"].append({
-        "version": next_ver,
-        "version_dir": ver_dir_name,
-        "path": relative_path,
-        "snapshot_at": now_iso()
-    })
-    if "current_versions" not in history_data:
-        history_data["current_versions"] = {}
-    history_data["current_versions"][relative_path] = next_ver
+    if within_window:
+        # 覆盖最后一次快照，不新增版本
+        ver_dir_name = last_record["version_dir"]
+        dest_path = os.path.join(history_base, ver_dir_name, *rel_parts)
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+        try:
+            with open(file_path, "rb") as src, open(dest_path, "wb") as dst:
+                dst.write(src.read())
+        except Exception as e:
+            print(f"[history] 快照覆盖失败: {e}")
+            return
+        # 更新该 record 的时间戳
+        last_record["snapshot_at"] = now_iso()
+        with open(history_json_path, "w", encoding="utf-8") as f:
+            json.dump(history_data, f, ensure_ascii=False, indent=2)
+        print(f"[history] 合并覆盖快照 {ver_dir_name}: {relative_path}")
+    else:
+        # 超出时间窗口，新增版本
+        next_ver = history_data.get("next_version", 1)
+        ver_dir_name = f"v{next_ver}"
 
-    with open(history_json_path, "w", encoding="utf-8") as f:
-        json.dump(history_data, f, ensure_ascii=False, indent=2)
+        dest_path = os.path.join(history_base, ver_dir_name, *rel_parts)
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+        try:
+            with open(file_path, "rb") as src, open(dest_path, "wb") as dst:
+                dst.write(src.read())
+        except Exception as e:
+            print(f"[history] 快照写入失败: {e}")
+            return
+
+        history_data["next_version"] = next_ver + 1
+        history_data["records"].append({
+            "version": next_ver,
+            "version_dir": ver_dir_name,
+            "path": relative_path,
+            "snapshot_at": now_iso()
+        })
+        if "current_versions" not in history_data:
+            history_data["current_versions"] = {}
+        history_data["current_versions"][relative_path] = next_ver
+
+        with open(history_json_path, "w", encoding="utf-8") as f:
+            json.dump(history_data, f, ensure_ascii=False, indent=2)
 
-    print(f"[history] 已保存快照 {ver_dir_name}: {relative_path}")
+        print(f"[history] 已保存快照 {ver_dir_name}: {relative_path}")
 
 
 def rollback_to_version(workspace_id: str, relative_path: str, version_dir: str):