@aiyiran/myclaw 1.1.87 → 1.1.89

package/assets/myclaw-artifacts.js

@@ -632,32 +632,23 @@
 
       var fullPath = asset.path || asset.name || '未命名';
       var parts = fullPath.split('/').filter(function (p) { return p !== ''; });
-      // 上行：倒数第二层以上的路径（若只有一层目录则无上行）
-      // 下行：直接父文件夹/文件名
-      var topPart = '';
-      var bottomPart = fullPath;
-      if (parts.length >= 3) {
-        // 有多层：上行 = 除最后两段外的路径，下行 = 最后两段
-        topPart = parts.slice(0, parts.length - 2).join('/') + '/';
-        bottomPart = parts.slice(parts.length - 2).join('/');
-      } else if (parts.length === 2) {
-        // 只有一层目录：只显示下行（dir/file）
-        topPart = '';
-        bottomPart = parts.join('/');
-      }
+      // 上行：相对路径（除文件名外的所有目录）
+      // 下行：文件名
+      var fileName = parts[parts.length - 1] || fullPath;
+      var dirPath = parts.length >= 2 ? parts.slice(0, parts.length - 1).join('/') + '/' : '';
 
-      // 上行：更上层路径（灰色极小字）
-      if (topPart) {
+      // 上行：相对路径（灰色极小字）
+      if (dirPath) {
         var dirSpan = document.createElement('span');
-        dirSpan.textContent = topPart;
+        dirSpan.textContent = dirPath;
         dirSpan.title = fullPath;
-        dirSpan.style.cssText = 'color:#666;font-size:9px;line-height:1.3;white-space:nowrap;';
+        dirSpan.style.cssText = 'color:#666;font-size:9px;line-height:1.3;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;';
         fname.appendChild(dirSpan);
       }
 
-      // 下行：直接父文件夹/文件名（大字体）
+      // 下行：文件名（大字体）
       var nameSpan = document.createElement('span');
-      nameSpan.textContent = bottomPart;
+      nameSpan.textContent = fileName;
       nameSpan.title = fullPath;
       nameSpan.style.cssText = 'font-size:13px;font-weight:500;line-height:1.5;white-space:nowrap;';
       fname.appendChild(nameSpan);
@@ -1230,8 +1221,6 @@
             row.appendChild(row3);
             leftPane.appendChild(row);
 
-            // 默认选中第一条并预览
-            if (idx === 0) setActive();
           });
         }
 
@@ -2366,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 = '⬇创建 -> 新伙伴';
@@ -2393,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 通过闭包读取
@@ -2594,7 +2582,7 @@
     // ── 并行：加载本地 index + 检查 CDN 更新 ──────────────────────────────
     var _pollTimer = null; // 提到外层，doSync 守卫用
 
-    function doSync() {
+    function doSync(force) {
       // 轮询进行中时点击无效，避免重复起 timer
       if (_pollTimer) return;
       headSyncBtn.disabled = true;
@@ -2646,7 +2634,7 @@
         }, 3000);
       }
 
-      fetch(MYCLAW_API_BASE + '/api/sync-templates?force=1')
+      fetch(MYCLAW_API_BASE + '/api/sync-templates' + (force ? '?force=1' : ''))
         .then(function (r) { return r.json(); })
         .then(function (sync) {
           headSyncBtn.disabled = false;
@@ -2680,7 +2668,7 @@
         });
     }
 
-    headSyncBtn.onclick = doSync;
+    headSyncBtn.onclick = function () { doSync(true); };
     doSync();
 
     fetch(MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(TEMPLATE_ROOT + '/template-index.json'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.1.87",
+  "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):

package/skills/yiran-course-template-pipeline/template-index.json

@@ -1,5 +1,5 @@
 {
-  "index_updated_at": "2026-05-07T09:28:31Z",
+  "index_updated_at": "2026-05-08T02:45:34Z",
   "templates": {
     "696de592": {
       "id": "696de592",
@@ -329,9 +329,9 @@
       "编号": "101",
       "名称": "万物图签：我的AI卡牌宇宙",
       "文件夹名": "c101_万物图签：我的AI卡牌宇宙",
-      "version": "v5",
-      "路径": "templates/c101_万物图签：我的AI卡牌宇宙/v5",
-      "入口文件": "templates/c101_万物图签：我的AI卡牌宇宙/v5/index.html",
+      "version": "v6",
+      "路径": "templates/c101_万物图签：我的AI卡牌宇宙/v6",
+      "入口文件": "templates/c101_万物图签：我的AI卡牌宇宙/v6/index.html",
       "一句话说明": "分四个阶段逐步做出你的精灵卡牌：先让角色诞生，再加属性和特效，最后扩展成一个系列。",
       "主能力标签": "第四能力：迭代推进",
       "任务类型标签": "视听表达",
@@ -348,7 +348,7 @@
         "第四能力：迭代推进",
         "视听表达"
       ],
-      "updated_at": "2026-05-07T09:02:35Z"
+      "updated_at": "2026-05-08T02:45:29Z"
     },
     "cf03758c": {
       "id": "cf03758c",

package/skills/yiran-course-template-pipeline/template-index.md

@@ -112,9 +112,9 @@
 
 ## C101 万物图签：我的AI卡牌宇宙
 - ID：a2f9502c
-- 版本：v5
-- 路径：templates/c101_万物图签：我的AI卡牌宇宙/v5
-- 入口文件：templates/c101_万物图签：我的AI卡牌宇宙/v5/index.html
+- 版本：v6
+- 路径：templates/c101_万物图签：我的AI卡牌宇宙/v6
+- 入口文件：templates/c101_万物图签：我的AI卡牌宇宙/v6/index.html
 - 主能力标签：第四能力：迭代推进
 - 任务类型标签：视听表达
 - 关键词：c101_万物图签：我的AI卡牌宇宙, 分四个阶段逐步做出你的精灵卡牌：先让角色诞生，再加属性和特效，最后扩展成一个系列。, 已经做过基础卡牌任务的学生, 对卡牌游戏有兴趣、想做出有系统感作品的学生, 会做但容易停在第一版不改的学生, 在复杂框架上读懂结构，再做定向修改, 规划主题和阵营分组逻辑, 明确识别问题并做一次有意识的迭代升级, 万物图签：我的AI卡牌宇宙, 第四能力：迭代推进, 视听表达