@aiyiran/myclaw 1.1.38 → 1.1.40

package/assets/myclaw-artifacts.js

@@ -2208,7 +2208,15 @@
     syncStatus.style.cssText = 'font-size:11px;color:rgba(205,214,244,0.4);transition:opacity 0.3s;';
     syncStatus.textContent = '⟳ 检查更新...';
 
+    var headSyncBtn = document.createElement('button');
+    headSyncBtn.textContent = '↺';
+    headSyncBtn.title = '检查并同步最新模板';
+    headSyncBtn.style.cssText = 'padding:3px 9px;background:rgba(255,255,255,0.07);border:1px solid rgba(255,255,255,0.15);border-radius:4px;color:#cdd6f4;font-size:13px;font-family:monospace;cursor:pointer;transition:all 0.15s;line-height:1;';
+    headSyncBtn.onmouseenter = function () { headSyncBtn.style.background = 'rgba(255,255,255,0.14)'; };
+    headSyncBtn.onmouseleave = function () { headSyncBtn.style.background = 'rgba(255,255,255,0.07)'; };
+
     headLeft.appendChild(headTitle);
+    headLeft.appendChild(headSyncBtn);
     headLeft.appendChild(syncStatus);
 
     var headClose = document.createElement('span');
@@ -2387,22 +2395,6 @@
           var infoSpan = document.createElement('span');
           infoSpan.style.cssText = 'font-size:12px;color:#cdd6f4;font-weight:500;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;';
           infoSpan.textContent = tpl['系列'] + tpl['编号'] + '  ' + tpl['名称'];
-          // 刷新按钮
-          var refreshBtn = document.createElement('button');
-          refreshBtn.textContent = '↺';
-          refreshBtn.title = '刷新预览';
-          refreshBtn.style.cssText = 'flex-shrink:0;padding:5px 10px;background:rgba(255,255,255,0.07);border:1px solid rgba(255,255,255,0.15);border-radius:4px;color:#cdd6f4;font-size:14px;font-family:monospace;cursor:pointer;transition:all 0.15s;white-space:nowrap;line-height:1;';
-          refreshBtn.onmouseenter = function () { refreshBtn.style.background = 'rgba(255,255,255,0.14)'; };
-          refreshBtn.onmouseleave = function () { refreshBtn.style.background = 'rgba(255,255,255,0.07)'; };
-          refreshBtn.onclick = function () {
-            var src = previewIframe.src;
-            previewIframe.src = '';
-            setTimeout(function () { previewIframe.src = src; }, 50);
-            refreshBtn.style.transform = 'rotate(360deg)';
-            refreshBtn.style.transition = 'transform 0.4s ease';
-            setTimeout(function () { refreshBtn.style.transform = ''; refreshBtn.style.transition = 'all 0.15s'; }, 450);
-          };
-
           // 新窗口打开按钮
           var openNewBtn = document.createElement('button');
           openNewBtn.textContent = '↗';
@@ -2428,11 +2420,11 @@
             });
           };
           rightHeader.appendChild(infoSpan);
-          rightHeader.appendChild(refreshBtn);
           rightHeader.appendChild(openNewBtn);
           rightHeader.appendChild(useBtn);
           previewIframe.src = MYCLAW_API_BASE + '/api/file?path='
-            + encodeURIComponent(TEMPLATE_ROOT + '/templates/' + tpl['文件夹名'] + '/__student-view__.html');
+            + encodeURIComponent(TEMPLATE_ROOT + '/templates/' + tpl['文件夹名'] + '/__student-view__.html')
+            + '&t=' + Date.now();
         }
 
         row.onclick = setActive;
@@ -2471,27 +2463,94 @@
     }
 
     // ── 并行：加载本地 index + 检查 CDN 更新 ──────────────────────────────
-    // 检查 CDN 更新（不阻塞列表加载）
-    fetch(MYCLAW_API_BASE + '/api/sync-templates')
-      .then(function (r) { return r.json(); })
-      .then(function (sync) {
-        if (!sync.changed) {
-          syncStatus.textContent = '';
-          return;
-        }
-        var msg = '';
-        if (sync.added && sync.added.length) msg += '新增 ' + sync.added.length + ' 个';
-        if (sync.updated && sync.updated.length) msg += (msg ? '，' : '') + '更新 ' + sync.updated.length + ' 个';
-        syncStatus.textContent = '✓ ' + msg;
-        syncStatus.style.color = '#10b981';
-        // 重新加载列表
+    function doSync() {
+      headSyncBtn.disabled = true;
+      headSyncBtn.style.opacity = '0.5';
+      syncStatus.style.color = 'rgba(205,214,244,0.4)';
+      syncStatus.textContent = '⟳ 检查更新...';
+
+      // 轮询句柄，用于清理
+      var _pollTimer = null;
+      var _pollDeadline = Date.now() + 10 * 60 * 1000; // 最多轮询 10 分钟
+
+      function _reloadList(onDone) {
         fetch(MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(TEMPLATE_ROOT + '/template-index.json'))
           .then(function (r) { return r.json(); })
-          .then(function (newIndex) { renderTemplateList(flattenTemplates(newIndex)); })
-          .catch(function () {});
-        setTimeout(function () { syncStatus.textContent = ''; }, 4000);
-      })
-      .catch(function () { syncStatus.textContent = ''; });
+          .then(function (idx) { renderTemplateList(flattenTemplates(idx)); if (onDone) onDone(); })
+          .catch(function () { if (onDone) onDone(); });
+      }
+
+      function _stopPolling() {
+        if (_pollTimer) { clearInterval(_pollTimer); _pollTimer = null; }
+      }
+
+      function _startPolling() {
+        _pollTimer = setInterval(function () {
+          if (Date.now() > _pollDeadline) {
+            _stopPolling();
+            syncStatus.textContent = '⚠ 同步超时';
+            setTimeout(function () { syncStatus.textContent = ''; }, 4000);
+            return;
+          }
+          fetch(MYCLAW_API_BASE + '/api/sync-status')
+            .then(function (r) { return r.json(); })
+            .then(function (s) {
+              if (s.running) {
+                syncStatus.textContent = '⟳ 同步中 ' + s.completed.length + '/' + s.total;
+                return;
+              }
+              // 完成
+              _stopPolling();
+              var result = s.result || {};
+              var msg = '';
+              if (result.added && result.added.length) msg += '新增 ' + result.added.length + ' 个';
+              if (result.updated && result.updated.length) msg += (msg ? '，' : '') + '更新 ' + result.updated.length + ' 个';
+              syncStatus.style.color = '#10b981';
+              syncStatus.textContent = '✓ ' + (msg || '已完成');
+              _reloadList(function () {
+                setTimeout(function () { syncStatus.textContent = ''; syncStatus.style.color = 'rgba(205,214,244,0.4)'; }, 4000);
+              });
+            })
+            .catch(function () { /* 网络抖动，下次再试 */ });
+        }, 3000);
+      }
+
+      fetch(MYCLAW_API_BASE + '/api/sync-templates')
+        .then(function (r) { return r.json(); })
+        .then(function (sync) {
+          headSyncBtn.disabled = false;
+          headSyncBtn.style.opacity = '1';
+          if (!sync.changed) {
+            syncStatus.textContent = '已是最新';
+            setTimeout(function () { syncStatus.textContent = ''; }, 2000);
+            return;
+          }
+          if (sync.syncing) {
+            // index 已写好，立刻刷新列表让用户看到模板
+            _reloadList(null);
+            syncStatus.textContent = '⟳ 同步中 ' + (sync.completed || []).length + '/' + (sync.total || '?');
+            _startPolling();
+            return;
+          }
+          // 极少数情况：同步在返回前已完成
+          var msg = '';
+          if (sync.added && sync.added.length) msg += '新增 ' + sync.added.length + ' 个';
+          if (sync.updated && sync.updated.length) msg += (msg ? '，' : '') + '更新 ' + sync.updated.length + ' 个';
+          syncStatus.style.color = '#10b981';
+          syncStatus.textContent = '✓ ' + (msg || '已更新');
+          _reloadList(function () {
+            setTimeout(function () { syncStatus.textContent = ''; syncStatus.style.color = 'rgba(205,214,244,0.4)'; }, 4000);
+          });
+        })
+        .catch(function () {
+          headSyncBtn.disabled = false;
+          headSyncBtn.style.opacity = '1';
+          syncStatus.textContent = '';
+        });
+    }
+
+    headSyncBtn.onclick = doSync;
+    doSync();
 
     fetch(MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(TEMPLATE_ROOT + '/template-index.json'))
       .then(function (r) {

package/package.json

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

package/server/sync_workspace.py

@@ -475,6 +475,82 @@ def sync_all(workspace_id):
     return True
 
 
+# ═══════════════════════════════════════════════════════════════
+# 模板同步：从 CDN 增量下载到本地
+# ═══════════════════════════════════════════════════════════════
+
+_sync_state = {
+    'running': False,
+    'last_result': None,
+    'completed': [],   # 已下载完成的 folder 名列表
+    'total': 0,        # 本次需要下载的 folder 总数
+}
+_sync_lock = threading.Lock()
+
+_SYNC_LOG = os.path.join(get_openclaw_path(), 'sync-templates.log')
+
+def _sync_log(msg):
+    line = '[{}] {}\n'.format(datetime.now(timezone.utc).strftime('%H:%M:%S'), msg)
+    print(line, end='')
+    try:
+        with open(_SYNC_LOG, 'a', encoding='utf-8') as f:
+            f.write(line)
+    except Exception:
+        pass
+
+TEMPLATE_CDN_PREFIX_BASE = 'myclaw/live/yiran/skills/yiran-playground-template-use/templates'
+TEMPLATE_LOCAL_DIR = os.path.join(get_openclaw_path(), 'skills', 'yiran-playground-template-use', 'templates')
+TEMPLATE_LOCAL_INDEX = os.path.join(get_openclaw_path(), 'skills', 'yiran-playground-template-use', 'template-index.json')
+TEMPLATE_CDN_INDEX_URL = 'https://cdn.yiranlaoshi.com/myclaw/live/yiran/skills/yiran-playground-template-use/template-index.json'
+
+
+def _do_sync_templates(cdn_index, local_index, pending):
+    """后台线程：按 folder 全量下载有变化的模板文件
+    pending: list of (folder_name, is_new)，已在调用方确定好
+    """
+    try:
+        added = []
+        updated = []
+
+        _sync_log('开始同步，共 {} 个 folder'.format(len(pending)))
+
+        for folder_name, is_new in pending:
+            _sync_log('{} {} → 下载中...'.format('新增' if is_new else '更新', folder_name))
+            cdn_prefix = TEMPLATE_CDN_PREFIX_BASE + '/{}/'.format(folder_name)
+            folder_dir = os.path.join(TEMPLATE_LOCAL_DIR, folder_name)
+            os.makedirs(folder_dir, exist_ok=True)
+
+            cdn_files = _list_files_from_qiniu(cdn_prefix)
+            _sync_log('  列举到 {} 个文件'.format(len(cdn_files)))
+            for item in cdn_files:
+                key = item.get('key', '')
+                filename = key[len(cdn_prefix):]
+                if not filename:
+                    continue
+                ok = _download_from_cdn(key, os.path.join(folder_dir, filename))
+                _sync_log('  {} {}'.format('✓' if ok else '✗', filename))
+
+            if is_new:
+                added.append(folder_name)
+            else:
+                updated.append(folder_name)
+
+            # 每完成一个 folder 就更新进度
+            with _sync_lock:
+                _sync_state['completed'].append(folder_name)
+
+        _sync_log('完成。新增: {}, 更新: {}'.format(added, updated))
+        with _sync_lock:
+            _sync_state['running'] = False
+            _sync_state['last_result'] = {'changed': True, 'added': added, 'updated': updated}
+
+    except Exception as e:
+        import traceback
+        _sync_log('异常: {}\n{}'.format(e, traceback.format_exc()))
+        with _sync_lock:
+            _sync_state['running'] = False
+
+
 # ═══════════════════════════════════════════════════════════════
 # Fork：从 CDN 克隆他人 workspace 到本地
 # ═══════════════════════════════════════════════════════════════
@@ -749,6 +825,8 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             return self._handle_file(params)
         elif path == '/api/sync-templates':
             return self._handle_sync_templates()
+        elif path == '/api/sync-status':
+            return self._handle_sync_status()
         else:
             self._send_json({"error": "not found"}, 404)
 
@@ -1105,22 +1183,17 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
 
     def _handle_sync_templates(self):
         """GET /api/sync-templates
-        检查 CDN 上的 template-index.json 是否比本地新，若有变化则增量下载。
-        返回 {changed: false} 或 {changed: true, added: [...], updated: [...]}
+        快速比对 CDN index_updated_at 与本地，若一致立即返回 {changed: false}。
+        若有变化，启动后台线程下载，立即返回 {changed: true, syncing: true}。
         """
-        CDN_INDEX_URL = 'https://cdn.yiranlaoshi.com/myclaw/live/yiran/skills/yiran-playground-template-use/template-index.json'
-        CDN_TEMPLATE_BASE = 'https://cdn.yiranlaoshi.com/myclaw/live/yiran/skills/yiran-playground-template-use/templates'
-
-        local_templates_dir = os.path.join(
-            get_openclaw_path(), 'skills', 'yiran-playground-template-use', 'templates'
-        )
-        local_index_path = os.path.join(
-            get_openclaw_path(), 'skills', 'yiran-playground-template-use', 'template-index.json'
-        )
-
+        # 快速拉取 CDN index（仅 JSON，通常 <1s）
         try:
-            # 拉取 CDN index
-            with urllib.request.urlopen(CDN_INDEX_URL, timeout=10) as resp:
+            import ssl
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+            url_with_ts = TEMPLATE_CDN_INDEX_URL + '?t=' + str(int(time.time()))
+            with urllib.request.urlopen(url_with_ts, timeout=10, context=ctx) as resp:
                 cdn_index = json.loads(resp.read().decode('utf-8'))
         except Exception as e:
             self._send_json({'error': 'CDN index 获取失败: ' + str(e)}, 502)
@@ -1128,9 +1201,9 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
 
         # 读取本地 index
         local_index = {}
-        if os.path.isfile(local_index_path):
+        if os.path.isfile(TEMPLATE_LOCAL_INDEX):
             try:
-                with open(local_index_path, 'r', encoding='utf-8') as f:
+                with open(TEMPLATE_LOCAL_INDEX, 'r', encoding='utf-8') as f:
                     local_index = json.load(f)
             except Exception:
                 pass
@@ -1142,55 +1215,87 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({'changed': False})
             return
 
-        # 找出新增和变更的模板
+        # 计算需要下载的 folder 列表
         cdn_templates = cdn_index.get('templates', {})
         local_templates = local_index.get('templates', {})
-        added = []
-        updated = []
-
+        pending = []  # list of (folder_name, is_new)
         for series, nums in cdn_templates.items():
             for num, record in nums.items():
                 folder_name = record.get('文件夹名', '')
-                cdn_ua = record.get('updated_at', '')
-                local_ua = local_templates.get(series, {}).get(num, {}).get('updated_at', '')
-
                 if not folder_name:
                     continue
-
+                cdn_ua = record.get('updated_at', '')
+                local_ua = local_templates.get(series, {}).get(num, {}).get('updated_at', '')
                 is_new = series not in local_templates or num not in local_templates.get(series, {})
                 is_changed = not is_new and cdn_ua != local_ua
+                if is_new or is_changed:
+                    pending.append((folder_name, is_new))
 
-                if not is_new and not is_changed:
-                    continue
+        if not pending:
+            # index_updated_at 变了但所有 folder 都没变，直接更新 index 即可
+            try:
+                os.makedirs(os.path.dirname(TEMPLATE_LOCAL_INDEX), exist_ok=True)
+                with open(TEMPLATE_LOCAL_INDEX, 'w', encoding='utf-8') as f:
+                    json.dump(cdn_index, f, ensure_ascii=False, indent=2)
+            except Exception:
+                pass
+            self._send_json({'changed': False})
+            return
 
-                # 从七牛列举该文件夹下所有文件，全量下载
-                cdn_prefix = 'myclaw/live/yiran/skills/yiran-playground-template-use/templates/{}/'.format(folder_name)
-                folder_dir = os.path.join(local_templates_dir, folder_name)
-                os.makedirs(folder_dir, exist_ok=True)
-                cdn_files = _list_files_from_qiniu(cdn_prefix)
-                for item in cdn_files:
-                    key = item.get('key', '')
-                    filename = key[len(cdn_prefix):]
-                    if not filename:
-                        continue
-                    dest = os.path.join(folder_dir, filename)
-                    _download_from_cdn(key, dest)
-
-                if is_new:
-                    added.append(folder_name)
-                else:
-                    updated.append(folder_name)
-
-        # 覆盖本地 index
+        # 已有同步在跑，直接返回当前进度
+        with _sync_lock:
+            if _sync_state['running']:
+                self._send_json({
+                    'changed': True, 'syncing': True,
+                    'completed': list(_sync_state['completed']),
+                    'total': _sync_state['total'],
+                })
+                return
+
+        # 先写 index.json，让前端列表立刻出现
         try:
-            os.makedirs(os.path.dirname(local_index_path), exist_ok=True)
-            with open(local_index_path, 'w', encoding='utf-8') as f:
+            os.makedirs(os.path.dirname(TEMPLATE_LOCAL_INDEX), exist_ok=True)
+            with open(TEMPLATE_LOCAL_INDEX, 'w', encoding='utf-8') as f:
                 json.dump(cdn_index, f, ensure_ascii=False, indent=2)
         except Exception as e:
             self._send_json({'error': 'index 写入失败: ' + str(e)}, 500)
             return
 
-        self._send_json({'changed': True, 'added': added, 'updated': updated})
+        # 初始化状态，启动后台线程
+        with _sync_lock:
+            _sync_state['running'] = True
+            _sync_state['last_result'] = None
+            _sync_state['completed'] = []
+            _sync_state['total'] = len(pending)
+
+        t = threading.Thread(
+            target=_do_sync_templates,
+            args=(cdn_index, local_index, pending),
+            daemon=True,
+        )
+        t.start()
+        self._send_json({
+            'changed': True, 'syncing': True,
+            'completed': [],
+            'total': len(pending),
+        })
+
+    def _handle_sync_status(self):
+        """GET /api/sync-status
+        返回当前后台同步进度。
+        运行中: {running: true, completed: [...], total: N}
+        完成后: {running: false, result: {changed, added, updated}}
+        """
+        with _sync_lock:
+            running = _sync_state['running']
+            completed = list(_sync_state['completed'])
+            total = _sync_state['total']
+            last_result = _sync_state['last_result']
+
+        if running:
+            self._send_json({'running': True, 'completed': completed, 'total': total})
+        else:
+            self._send_json({'running': False, 'result': last_result})
 
     def log_message(self, format, *args):
         # 静默日志，避免轮询刷屏

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

@@ -1,5 +1,5 @@
 {
-  "index_updated_at": "2026-04-22T05:27:04Z",
+  "index_updated_at": "2026-04-22T06:16:49Z",
   "templates": {
     "A": {
       "100": {
@@ -133,7 +133,7 @@
           "迭代推进",
           "游戏机制"
         ],
-        "updated_at": "2026-04-22T05:23:43Z"
+        "updated_at": "2026-04-22T06:16:45Z"
       }
     },
     "B": {