@aiyiran/myclaw 1.1.44 → 1.1.45

package/assets/myclaw-artifacts.js

@@ -2310,6 +2310,8 @@
           resetBtn(copyLocalBtn);
           if (res.ok) {
             setFooterStatus('✓ 已复制到 ' + res.folder_rel_path, '#10b981');
+          } else if (res.code === 'not_ready') {
+            setFooterStatus('⟳ 模板文件下载中，完成后即可使用', '#f59e0b');
           } else {
             setFooterStatus('✗ ' + (res.error || '复制失败'), '#ff4444');
           }
@@ -2341,6 +2343,8 @@
                 window.location.href = 'http://127.0.0.1:18789/chat?session=' + encodeURIComponent(sessionParam);
               }, 4000);
             }
+          } else if (res.code === 'not_ready') {
+            setFooterStatus('⟳ 模板文件下载中，完成后即可使用', '#f59e0b');
           } else {
             setFooterStatus('✗ ' + (res.error || '创建失败'), '#ff4444');
           }
@@ -2367,13 +2371,14 @@
     leftPane.appendChild(loadingEl);
 
     function flattenTemplates(indexData) {
-      // 兼容新格式 {index_updated_at, templates: {...}} 和旧格式 {A: {...}}
+      // 新格式：{index_updated_at, templates: {id: record}}，直接平铺
       var raw = indexData.templates || indexData;
-      var list = [];
-      Object.keys(raw).sort().forEach(function (series) {
-        Object.keys(raw[series]).sort(function (a, b) { return parseInt(a) - parseInt(b); }).forEach(function (num) {
-          list.push(raw[series][num]);
-        });
+      var list = Object.values(raw);
+      // 按系列+编号排序
+      list.sort(function (a, b) {
+        var sa = (a['系列'] || '') + ('000' + (a['编号'] || '0')).slice(-4);
+        var sb = (b['系列'] || '') + ('000' + (b['编号'] || '0')).slice(-4);
+        return sa < sb ? -1 : sa > sb ? 1 : 0;
       });
       return list;
     }
@@ -2423,7 +2428,7 @@
           rightHeader.appendChild(infoSpan);
           rightHeader.appendChild(openNewBtn);
           rightHeader.appendChild(useBtn);
-          previewIframe.src = TEMPLATE_CDN_BASE + '/' + encodeURIComponent(tpl['文件夹名']) + '/__student-view__.html?t=' + Date.now();
+          previewIframe.src = TEMPLATE_CDN_BASE + '/' + encodeURIComponent(tpl['文件夹名']) + '/' + (tpl['version'] || 'v1') + '/__student-view__.html?t=' + Date.now();
         }
 
         row.onclick = setActive;
@@ -2437,7 +2442,7 @@
         badge.style.cssText = 'font-size:10px;font-weight:bold;background:#4a4a7a;color:#cdd6f4;padding:1px 7px;border-radius:8px;flex-shrink:0;';
         var nameEl = document.createElement('span');
         nameEl.textContent = tpl['名称'];
-        nameEl.style.cssText = 'font-size:12px;color:#cdd6f4;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;';
+        nameEl.style.cssText = 'font-size:12px;color:#cdd6f4;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;flex:1;';
         topRow.appendChild(badge);
         topRow.appendChild(nameEl);
 
@@ -2461,6 +2466,7 @@
       });
     }
 
+    // ── 就绪状态追踪 ──────────────────────────────────────────────────────
     // ── 并行：加载本地 index + 检查 CDN 更新 ──────────────────────────────
     var _pollTimer = null; // 提到外层，doSync 守卫用
 

package/package.json

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

package/server/sync_workspace.py

@@ -505,28 +505,40 @@ TEMPLATE_CDN_INDEX_URL = 'https://cdn.yiranlaoshi.com/myclaw/live/yiran/skills/y
 
 
 def _do_sync_templates(cdn_index, local_index, pending):
-    """后台线程：按 folder 全量下载有变化的模板文件
-    pending: list of (folder_name, is_new)，已在调用方确定好
+    """后台线程：按 folder+version 全量下载有变化的模板文件
+    pending: list of (folder_name, version_str, is_new)
+
+    流程：
+    1. 删除旧版本目录（保证本地只有一个版本）
+    2. 下载到临时目录 .tmp/
+    3. 下载完成后 rename .tmp/ → v{N}/（版本目录存在即代表就绪）
     """
+    import shutil
     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)
-
-            # 下载开始前先删掉标记，防止更新窗口期内被误判为就绪
-            done_marker = os.path.join(folder_dir, '.sync-done')
-            try:
-                os.remove(done_marker)
-            except OSError:
-                pass
+        for folder_name, version_str, is_new in pending:
+            _sync_log('{} {}/{} → 下载中...'.format('新增' if is_new else '更新', folder_name, version_str))
 
+            cdn_prefix = '{}/{}/{}/'.format(TEMPLATE_CDN_PREFIX_BASE, folder_name, version_str)
+            folder_dir = os.path.join(TEMPLATE_LOCAL_DIR, folder_name)
+            version_dir = os.path.join(folder_dir, version_str)
+            tmp_dir = os.path.join(folder_dir, '.tmp')
+
+            # 1. 删除旧版本目录和残留临时目录
+            if os.path.isdir(folder_dir):
+                for entry in os.listdir(folder_dir):
+                    if re.match(r'^v\d+$', entry) and entry != version_str:
+                        shutil.rmtree(os.path.join(folder_dir, entry), ignore_errors=True)
+                        _sync_log('  删除旧版本: {}'.format(entry))
+            if os.path.isdir(tmp_dir):
+                shutil.rmtree(tmp_dir, ignore_errors=True)
+
+            # 2. 下载到 .tmp/
+            os.makedirs(tmp_dir, exist_ok=True)
             cdn_files = _list_files_from_qiniu(cdn_prefix)
             _sync_log('  列举到 {} 个文件'.format(len(cdn_files)))
             for item in cdn_files:
@@ -534,22 +546,18 @@ def _do_sync_templates(cdn_index, local_index, pending):
                 filename = key[len(cdn_prefix):]
                 if not filename:
                     continue
-                ok = _download_from_cdn(key, os.path.join(folder_dir, filename))
+                ok = _download_from_cdn(key, os.path.join(tmp_dir, filename))
                 _sync_log('  {} {}'.format('✓' if ok else '✗', filename))
 
-            # 全部下完后写标记
-            try:
-                with open(done_marker, 'w') as f:
-                    f.write(cdn_ua or '')
-            except Exception:
-                pass
+            # 3. rename .tmp/ → v{N}/ （目录存在即代表该版本就绪）
+            os.rename(tmp_dir, version_dir)
+            _sync_log('  → 已就绪: {}/{}'.format(folder_name, version_str))
 
             if is_new:
                 added.append(folder_name)
             else:
                 updated.append(folder_name)
 
-            # 每完成一个 folder 就更新进度
             with _sync_lock:
                 _sync_state['completed'].append(folder_name)
 
@@ -1057,18 +1065,29 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
         )
 
     def _resolve_template_path(self, folder):
-        """校验 folder 并返回模板绝对路径；非法时直接响应并返回 None"""
+        """校验 folder 并返回模板最新版本绝对路径；非法或未就绪时直接响应并返回 None"""
         if not folder or '..' in folder or '/' in folder or '\\' in folder:
             self._send_json({'error': 'invalid folder'}, 400)
             return None
-        path = os.path.join(
+        folder_dir = os.path.join(
             get_openclaw_path(), 'skills',
             'yiran-playground-template-use', 'templates', folder
         )
-        if not os.path.isfile(os.path.join(path, '.sync-done')):
+        # 找最新 v{N} 子目录（目录存在即代表就绪）
+        max_v = 0
+        version_path = None
+        if os.path.isdir(folder_dir):
+            for entry in os.listdir(folder_dir):
+                m = re.match(r'^v(\d+)$', entry)
+                if m:
+                    v = int(m.group(1))
+                    if v > max_v:
+                        max_v = v
+                        version_path = os.path.join(folder_dir, entry)
+        if not version_path:
             self._send_json({'error': '模板尚未下载完成，请稍后重试', 'code': 'not_ready'}, 409)
             return None
-        return path
+        return version_path
 
     def _run_skill_script(self, cmd, timeout=60):
         """运行 skill 脚本，解析 stdout JSON 并返回 (data, err)"""
@@ -1229,21 +1248,21 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({'changed': False})
             return
 
-        # 计算需要下载的 folder 列表
+        # 计算需要下载的 folder 列表（新格式：index.templates 为 {id: record} 平铺字典）
+        # 就绪标准：{folder}/{version}/ 目录存在即代表完整就绪
         cdn_templates = cdn_index.get('templates', {})
         local_templates = local_index.get('templates', {})
-        pending = []  # list of (folder_name, is_new)
-        for series, nums in cdn_templates.items():
-            for num, record in nums.items():
-                folder_name = record.get('文件夹名', '')
-                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))
+        pending = []  # list of (folder_name, version_str, is_new)
+        for tid, record in cdn_templates.items():
+            folder_name = record.get('文件夹名', '')
+            version_str = record.get('version', 'v1')
+            if not folder_name:
+                continue
+            version_dir = os.path.join(TEMPLATE_LOCAL_DIR, folder_name, version_str)
+            if os.path.isdir(version_dir):
+                continue  # 本地已有该版本，无需下载
+            is_new = tid not in local_templates
+            pending.append((folder_name, version_str, is_new))
 
         if not pending:
             # index_updated_at 变了但所有 folder 都没变，直接更新 index 即可
@@ -1306,10 +1325,22 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             total = _sync_state['total']
             last_result = _sync_state['last_result']
 
+        # 扫描磁盘，返回实际已就绪的 folder 列表（v{N}/ 目录存在即就绪）
+        ready = []
+        if os.path.isdir(TEMPLATE_LOCAL_DIR):
+            for folder in os.listdir(TEMPLATE_LOCAL_DIR):
+                folder_path = os.path.join(TEMPLATE_LOCAL_DIR, folder)
+                if not os.path.isdir(folder_path):
+                    continue
+                for version_entry in os.listdir(folder_path):
+                    if re.match(r'^v\d+$', version_entry) and os.path.isdir(os.path.join(folder_path, version_entry)):
+                        ready.append(folder)
+                        break
+
         if running:
-            self._send_json({'running': True, 'completed': completed, 'total': total})
+            self._send_json({'running': True, 'completed': completed, 'total': total, 'ready': ready})
         else:
-            self._send_json({'running': False, 'result': last_result})
+            self._send_json({'running': False, 'result': last_result, 'ready': ready})
 
     def log_message(self, format, *args):
         # 静默日志，避免轮询刷屏

package/skills/yiran-course-template-pipeline/scripts/build_template_index.py

@@ -1,4 +1,12 @@
 #!/usr/bin/env python3
+"""
+build_template_index.py
+
+扫描 templates/ 目录，为每个模板读取最新版本子目录（v{N}/）中的
+__teacher__.json 和 __student__.json，生成 template-index.json 和 template-index.md。
+
+index 以 _id 为主键（flat 结构），每条记录包含版本号。
+"""
 import json
 import re
 from datetime import datetime, timezone
@@ -11,7 +19,7 @@ OUTPUT_JSON = ROOT / 'template-index.json'
 OUTPUT_MD = ROOT / 'template-index.md'
 
 
-def read_json(path: Path):
+def read_json(path: Path) -> dict:
     try:
         return json.loads(path.read_text(encoding='utf-8'))
     except Exception:
@@ -25,15 +33,30 @@ def parse_folder_name(name: str):
     return None, None, None
 
 
-def get_entry_file(folder: Path) -> Optional[Path]:
+def get_latest_version_dir(folder: Path):
+    """返回最新版本子目录 Path 和版本号 int，没有则返回 (None, 0)"""
+    max_v = 0
+    result = None
+    for d in folder.iterdir():
+        if d.is_dir():
+            m = re.match(r'^v(\d+)$', d.name)
+            if m:
+                v = int(m.group(1))
+                if v > max_v:
+                    max_v = v
+                    result = d
+    return result, max_v
+
+
+def get_entry_file(version_dir: Path) -> Optional[Path]:
     for name in ['index.html', '__demo__.html', '__student-view__.html']:
-        if (folder / name).exists():
-            return folder / name
+        if (version_dir / name).exists():
+            return version_dir / name
     return None
 
 
 def main():
-    index = {}
+    templates = {}   # { _id: record }
     items_for_md = []
 
     for folder in sorted(TEMPLATES_DIR.iterdir() if TEMPLATES_DIR.exists() else []):
@@ -44,8 +67,16 @@ def main():
         if not series:
             continue
 
-        teacher = read_json(folder / '__teacher__.json')
-        student = read_json(folder / '__student__.json')
+        version_dir, version_num = get_latest_version_dir(folder)
+        if not version_dir:
+            continue
+
+        teacher = read_json(version_dir / '__teacher__.json')
+        student = read_json(version_dir / '__student__.json')
+
+        tid = teacher.get('_id', '').strip()
+        if not tid:
+            continue
 
         name = teacher.get('任务名称') or student.get('任务标题', '')
         一句话 = student.get('一句话说明', '')
@@ -62,20 +93,25 @@ def main():
             类型标签,
         ])))
 
-        entry = get_entry_file(folder)
+        entry = get_entry_file(version_dir)
 
-        # 文件夹最新 mtime 作为变更标记
-        folder_mtime = max((f.stat().st_mtime for f in folder.iterdir() if f.is_file()), default=0)
+        all_files = list(version_dir.rglob('*'))
+        folder_mtime = max(
+            (f.stat().st_mtime for f in all_files if f.is_file()),
+            default=0
+        )
         updated_at = datetime.fromtimestamp(folder_mtime, tz=timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 
+        version_str = f'v{version_num}'
+
         record = {
+            'id': tid,
             '系列': series,
             '编号': number,
             '名称': name,
             '文件夹名': folder.name,
-            '路径': str(folder.relative_to(ROOT)),
-            'student_json': str((folder / '__student__.json').relative_to(ROOT)) if (folder / '__student__.json').exists() else '',
-            'teacher_json': str((folder / '__teacher__.json').relative_to(ROOT)) if (folder / '__teacher__.json').exists() else '',
+            'version': version_str,
+            '路径': str(version_dir.relative_to(ROOT)),
             '入口文件': str(entry.relative_to(ROOT)) if entry else '',
             '一句话说明': 一句话,
             '主能力标签': 能力标签,
@@ -84,28 +120,29 @@ def main():
             'updated_at': updated_at,
         }
 
-        if series not in index:
-            index[series] = {}
-        index[series][number] = record
+        templates[tid] = record
         items_for_md.append(record)
 
     index_updated_at = datetime.now(tz=timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
-    output = {'index_updated_at': index_updated_at, 'templates': index}
+    output = {'index_updated_at': index_updated_at, 'templates': templates}
     OUTPUT_JSON.write_text(json.dumps(output, ensure_ascii=False, indent=2), encoding='utf-8')
 
+    items_for_md.sort(key=lambda x: (x['系列'], int(x['编号'])))
     lines = ['# 模板索引', '', '每次 templates 内模板有变化后，都应重新运行本脚本。', '']
     for item in items_for_md:
         lines.append(f"## {item['系列']}{item['编号']} {item['名称']}")
+        lines.append(f"- ID：{item['id']}")
+        lines.append(f"- 版本：{item['version']}")
         lines.append(f"- 路径：{item['路径']}")
         lines.append(f"- 入口文件：{item['入口文件']}")
         lines.append(f"- 主能力标签：{item['主能力标签']}")
         lines.append(f"- 任务类型标签：{item['任务类型标签']}")
         if item['关键词']:
-            lines.append(f"- 关键词：{', '.join(item['关键词'])}")
+            lines.append(f"- 关键词：{', '.join(str(k) for k in item['关键词'])}")
         lines.append('')
 
     OUTPUT_MD.write_text('\n'.join(lines), encoding='utf-8')
-    print(f'已生成: {OUTPUT_JSON}')
+    print(f'已生成: {OUTPUT_JSON}（共 {len(templates)} 条）')
     print(f'已生成: {OUTPUT_MD}')
 
 

package/skills/yiran-course-template-pipeline/scripts/identify_template.py

@@ -0,0 +1,176 @@
+#!/usr/bin/env python3
+"""
+identify_template.py
+
+给模板源目录颁发或校准身份信息，直接修改源目录的 __teacher__.json。
+不做任何文件移动，可单独运行。
+
+写入字段：
+  _id       : 8位十六进制，首次颁发，后续不变
+  _version  : 首次=1，更新=已有版本+1
+  任务类别  : 校准后的系列（A/B/C）
+  任务编号  : 校准后的3位编号（100起）
+
+用法：
+    python3 identify_template.py <模板目录>
+"""
+import json
+import re
+import secrets
+import sys
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parent.parent
+TEMPLATES_DIR = ROOT / 'templates'
+
+
+def load_json(path: Path) -> dict:
+    try:
+        return json.loads(path.read_text(encoding='utf-8'))
+    except Exception:
+        return {}
+
+
+def save_json(path: Path, data: dict):
+    path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + '\n', encoding='utf-8')
+
+
+def gen_id() -> str:
+    return secrets.token_hex(4)  # 8位十六进制
+
+
+def normalize_category(raw) -> str:
+    cat = str(raw).upper().strip()
+    if cat not in {'A', 'B', 'C'}:
+        raise ValueError(f'任务类别只能是 A、B、C，当前: {cat}')
+    return cat
+
+
+def get_latest_version_num(folder: Path) -> int:
+    """返回 folder 下最大的版本号，没有则返回 0"""
+    max_v = 0
+    for d in folder.iterdir():
+        if d.is_dir():
+            m = re.match(r'^v(\d+)$', d.name)
+            if m:
+                max_v = max(max_v, int(m.group(1)))
+    return max_v
+
+
+def scan_templates(templates_dir: Path):
+    """
+    扫描 templates/ 下所有已入库模板。
+    返回：
+      id_map     : { _id -> {'folder': Path, 'version': int} }
+      number_map : { category -> { number(int) -> _id } }
+    """
+    id_map = {}
+    number_map = {}
+    pattern = re.compile(r'^([a-zA-Z])(\d{3})_')
+
+    if not templates_dir.exists():
+        return id_map, number_map
+
+    for folder in templates_dir.iterdir():
+        if not folder.is_dir():
+            continue
+        m = pattern.match(folder.name)
+        if not m:
+            continue
+
+        version_num = get_latest_version_num(folder)
+        if version_num == 0:
+            continue
+
+        version_dir = folder / f'v{version_num}'
+        teacher = load_json(version_dir / '__teacher__.json')
+        tid = teacher.get('_id')
+        if not tid:
+            continue
+
+        cat = m.group(1).upper()
+        num = int(m.group(2))
+
+        id_map[tid] = {'folder': folder, 'version': version_num}
+        number_map.setdefault(cat, {})[num] = tid
+
+    return id_map, number_map
+
+
+def calibrate_number(category: str, desired: int, number_map: dict, own_id: str) -> int:
+    """
+    校准编号：
+    - 宣称的编号不存在，或已属于自己 → 合法，直接用
+    - 已被别人占用 → 找最小可用编号（>=100）
+    """
+    used = number_map.get(category, {})
+    owner = used.get(desired)
+    if owner is None or owner == own_id:
+        return desired
+    # 冲突，找最小可用
+    for num in range(100, 1000):
+        if num not in used or used[num] == own_id:
+            return num
+    raise RuntimeError(f'{category} 类编号已用尽')
+
+
+def main():
+    if len(sys.argv) < 2:
+        print('用法: python3 identify_template.py <模板目录>')
+        sys.exit(1)
+
+    source_dir = Path(sys.argv[1]).expanduser().resolve()
+    teacher_path = source_dir / '__teacher__.json'
+
+    if not teacher_path.exists():
+        print(f'❌ 找不到 __teacher__.json: {teacher_path}')
+        sys.exit(1)
+
+    teacher = load_json(teacher_path)
+    id_map, number_map = scan_templates(TEMPLATES_DIR)
+
+    # ── 1. _id 与版本号 ────────────────────────────────────────────────────
+    tid = teacher.get('_id', '').strip()
+    in_templates = tid and tid in id_map
+
+    if not tid:
+        tid = gen_id()
+        new_version = 1
+        print(f'🆔 颁发新 ID: {tid}  版本: v1')
+    elif not in_templates:
+        new_version = 1
+        print(f'🆔 已有 ID {tid}，首次入库  版本: v1')
+    else:
+        old_version = id_map[tid]['version']
+        new_version = old_version + 1
+        print(f'🔄 更新 ID {tid}  版本: v{old_version} → v{new_version}')
+
+    # ── 2. 校准 任务类别 + 任务编号 ────────────────────────────────────────
+    try:
+        category = normalize_category(teacher.get('任务类别', ''))
+    except ValueError as e:
+        print(f'❌ {e}')
+        sys.exit(1)
+
+    try:
+        desired = int(str(teacher.get('任务编号', '100')))
+    except ValueError:
+        desired = 100
+
+    calibrated = calibrate_number(category, desired, number_map, tid)
+    if calibrated != desired:
+        print(f'⚠️  编号冲突：{category}{desired:03d} 已被占用，校准为 {category}{calibrated:03d}')
+
+    # ── 3. 写回 __teacher__.json ───────────────────────────────────────────
+    teacher['_id'] = tid
+    teacher['_version'] = new_version
+    teacher['任务类别'] = category
+    teacher['任务编号'] = f'{calibrated:03d}'
+    save_json(teacher_path, teacher)
+
+    print(f'✅ 已写回: {teacher_path}')
+    print(f'   _id={tid}, _version=v{new_version}, 分类={category}{calibrated:03d}')
+
+
+if __name__ == '__main__':
+    main()

package/skills/yiran-course-template-pipeline/scripts/migrate_templates.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+"""
+migrate_templates.py
+
+将旧版平铺结构迁移到版本化结构：
+  templates/{folder}/*.html  →  templates/{folder}/v1/*.html
+
+同时为没有 _id 的模板颁发 ID，写入 __teacher__.json。
+
+用法：
+    python3 scripts/migrate_templates.py [--dry-run]
+"""
+import json
+import re
+import secrets
+import shutil
+import sys
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parent.parent
+TEMPLATES_DIR = ROOT / 'templates'
+INDEX_SCRIPT = ROOT / 'scripts' / 'build_template_index.py'
+
+
+def load_json(path: Path) -> dict:
+    try:
+        return json.loads(path.read_text(encoding='utf-8'))
+    except Exception:
+        return {}
+
+
+def save_json(path: Path, data: dict):
+    path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + '\n', encoding='utf-8')
+
+
+def gen_id() -> str:
+    return secrets.token_hex(4)
+
+
+def has_version_subdir(folder: Path) -> bool:
+    for d in folder.iterdir():
+        if d.is_dir() and re.match(r'^v\d+$', d.name):
+            return True
+    return False
+
+
+def main():
+    dry_run = '--dry-run' in sys.argv
+    if dry_run:
+        print('🔍 DRY RUN 模式，不实际修改文件\n')
+
+    if not TEMPLATES_DIR.exists():
+        print('❌ templates/ 目录不存在')
+        sys.exit(1)
+
+    folders = sorted(d for d in TEMPLATES_DIR.iterdir() if d.is_dir())
+    migrated = 0
+
+    for folder in folders:
+        if has_version_subdir(folder):
+            print(f'✓ 跳过（已版本化）: {folder.name}')
+            continue
+
+        # 列出所有直接子文件（排除目录）
+        files = [f for f in folder.iterdir() if f.is_file()]
+        if not files:
+            print(f'⚠️  空目录，跳过: {folder.name}')
+            continue
+
+        teacher_path = folder / '__teacher__.json'
+        teacher = load_json(teacher_path)
+
+        # 补充 _id
+        if not teacher.get('_id'):
+            teacher['_id'] = gen_id()
+            print(f'🆔 颁发 ID {teacher["_id"]}: {folder.name}')
+
+        # 补充 _version
+        if not teacher.get('_version'):
+            teacher['_version'] = 1
+
+        if not dry_run:
+            # 先写回 __teacher__.json
+            save_json(teacher_path, teacher)
+
+            # 创建 v1/ 并移动所有文件
+            v1_dir = folder / 'v1'
+            v1_dir.mkdir(exist_ok=True)
+            for f in files:
+                shutil.move(str(f), str(v1_dir / f.name))
+
+        print(f'📦 迁移: {folder.name}  →  {folder.name}/v1/')
+        migrated += 1
+
+    print(f'\n{"[DRY RUN] " if dry_run else ""}共迁移 {migrated} 个模板')
+
+    if not dry_run and migrated > 0:
+        import subprocess
+        subprocess.run(['python3', str(INDEX_SCRIPT)], check=True)
+        print('✅ 索引已重建')
+
+
+if __name__ == '__main__':
+    main()

package/skills/yiran-course-template-pipeline/scripts/move_template_task.py

@@ -1,4 +1,19 @@
 #!/usr/bin/env python3
+"""
+move_template_task.py
+
+将模板源目录纳入 pipeline（复制，不删除原目录）。
+
+流程：
+1. 校验必需文件
+2. 调用 identify_template.py（颁发/校准身份，写回源目录）
+3. 读取更新后的 __teacher__.json，拼出目标路径
+4. 复制到 templates/{folder_name}/v{N}/
+5. 重建 template-index.json
+
+用法：
+    python3 move_template_task.py <模板目录> [目标根目录]
+"""
 import json
 import re
 import shutil
@@ -8,86 +23,71 @@ from pathlib import Path
 
 ROOT = Path(__file__).resolve().parent.parent
 DEFAULT_TARGET = ROOT / 'templates'
+IDENTIFY_SCRIPT = ROOT / 'scripts' / 'identify_template.py'
 INDEX_SCRIPT = ROOT / 'scripts' / 'build_template_index.py'
-REQUIRED_FILES = ['__demo__.html', '__student__.json', '__teacher__.json', '__student-view__.html', '__teacher-view__.html']
-
-
-def load_json(path):
-    with path.open('r', encoding='utf-8') as f:
-        return json.load(f)
-
-
-def save_json(path, data):
-    path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + '\n', encoding='utf-8')
-
-
-def normalize_category(teacher):
-    category = str(teacher['任务类别']).upper()
-    if category not in {'A', 'B', 'C'}:
-        raise ValueError('任务类别只能是 A、B、C')
-    return category
-
+REQUIRED_FILES = [
+    '__demo__.html', '__student__.json', '__teacher__.json',
+    '__student-view__.html', '__teacher-view__.html',
+]
 
-def sanitize_name(name):
-    return str(name).replace('/', '_').replace(' ', '_')
 
+def load_json(path: Path) -> dict:
+    try:
+        return json.loads(path.read_text(encoding='utf-8'))
+    except Exception:
+        return {}
 
-def find_next_available_number(category, target_root):
-    used = set()
-    pattern = re.compile(r'^([a-zA-Z])(\d{3})_')
 
-    for folder in target_root.iterdir() if target_root.exists() else []:
-        if not folder.is_dir():
-            continue
-        m = pattern.match(folder.name)
-        if not m:
-            continue
-        if m.group(1).upper() != category:
-            continue
-        used.add(int(m.group(2)))
-
-    for num in range(100, 1000):
-        if num not in used:
-            return f'{num:03d}'
-    raise RuntimeError(f'{category} 类编号已用尽')
-
-
-def task_folder_name(teacher, target_root):
-    category = normalize_category(teacher)
-    number = find_next_available_number(category, target_root)
-    teacher['任务编号'] = number
-    name = sanitize_name(teacher['任务名称'])
-    return f'{category.lower()}{number}_{name}'
+def sanitize_name(name: str) -> str:
+    return re.sub(r'[/\\ ]', '_', str(name).strip())
 
 
 def main():
     if len(sys.argv) < 2:
-        print('用法: python3 move_template_task.py <已有文件夹> [目标目录]')
+        print('用法: python3 move_template_task.py <模板目录> [目标根目录]')
         sys.exit(1)
 
     source_dir = Path(sys.argv[1]).expanduser().resolve()
     target_root = Path(sys.argv[2]).expanduser().resolve() if len(sys.argv) > 2 else DEFAULT_TARGET
 
+    if not source_dir.is_dir():
+        print(f'❌ 目录不存在: {source_dir}')
+        sys.exit(1)
+
+    # 1. 校验必需文件
     for filename in REQUIRED_FILES:
         if not (source_dir / filename).exists():
-            raise FileNotFoundError(f'缺少必需文件: {filename}')
+            print(f'❌ 缺少必需文件: {filename}')
+            sys.exit(1)
 
-    teacher_path = source_dir / '__teacher__.json'
-    teacher = load_json(teacher_path)
-    target_root.mkdir(parents=True, exist_ok=True)
-    folder_name = task_folder_name(teacher, target_root)
-    save_json(teacher_path, teacher)
+    # 2. 颁发/校准身份（写回源目录的 __teacher__.json）
+    print('\n── 身份认证 ────────────────────────────────')
+    subprocess.run([sys.executable, str(IDENTIFY_SCRIPT), str(source_dir)], check=True)
+
+    # 3. 读取更新后的身份信息
+    teacher = load_json(source_dir / '__teacher__.json')
+    category = teacher.get('任务类别', '').upper()
+    number = teacher.get('任务编号', '100')
+    name = sanitize_name(teacher.get('任务名称', 'untitled'))
+    version = teacher.get('_version', 1)
+
+    folder_name = f'{category.lower()}{number}_{name}'
+    version_str = f'v{version}'
+    target_dir = target_root / folder_name / version_str
 
-    target_dir = target_root / folder_name
     if target_dir.exists():
-        raise FileExistsError(f'目标目录已存在: {target_dir}')
+        print(f'❌ 目标目录已存在（重复操作？）: {target_dir}')
+        sys.exit(1)
 
-    shutil.move(str(source_dir), str(target_dir))
-    print(f'已移动并改名到: {target_dir}')
-    print(f'已自动分配编号: {teacher["任务编号"]}')
+    # 4. 复制到 templates/{folder}/v{N}/
+    print(f'\n── 复制文件 ────────────────────────────────')
+    target_root.mkdir(parents=True, exist_ok=True)
+    shutil.copytree(str(source_dir), str(target_dir))
+    print(f'✅ 已复制到: {target_dir}')
 
-    subprocess.run(['python3', str(INDEX_SCRIPT)], check=True)
-    print('已自动重建 templates 索引')
+    # 5. 重建 index
+    print(f'\n── 重建索引 ────────────────────────────────')
+    subprocess.run([sys.executable, str(INDEX_SCRIPT)], check=True)
 
 
 if __name__ == '__main__':

package/skills/yiran-course-template-pipeline/scripts/publish_template.py

@@ -4,85 +4,99 @@ publish_template.py
 
 发布模板文件夹到七牛 CDN，完成后重建并上传 template-index.json。
 
-流程：
-1. 把文件夹内所有文件无脑上传到七牛（强制覆盖）
-2. 重建 template-index.json 并上传到 CDN
+CDN 路径：{CDN_PREFIX}/{folder_name}/{version}/{filename}
+版本号从 templates/{folder}/v{N}/ 子目录读取（以本地最新版本为准）。
 
 用法：
     python3 scripts/publish_template.py <模板文件夹路径>
     python3 scripts/publish_template.py --all
-
-例：
-    python3 scripts/publish_template.py templates/a103_做一个介绍页面
-    python3 scripts/publish_template.py --all
 """
-
 import argparse
+import re
 import subprocess
 import sys
 from pathlib import Path
 
 from qiniu import Auth, put_file_v2, CdnManager
 
-# ── 七牛配置（与 server 保持一致）──────────────────────────────────────────
 QINIU_KEY    = "T3tgxM7EMx1j4VESw4m4PIfFXoOvBo-wQEOQewXX"
 QINIU_SECRET = "PVZvlKVOjX2RqlV2ILMg-QwpNMssOlpVbaEzypz0"
 QINIU_BUCKET = "yiran1"
 CDN_DOMAIN   = "https://cdn.yiranlaoshi.com"
-CDN_PREFIX   = "myclaw/live/yiran/skills/yiran-playground-template-use/templates"
+CDN_INDEX_KEY = "myclaw/live/yiran/skills/yiran-playground-template-use/template-index.json"
+CDN_PREFIX    = "myclaw/live/yiran/skills/yiran-playground-template-use/templates"
 
 q           = Auth(QINIU_KEY, QINIU_SECRET)
 cdn_manager = CdnManager(q)
 
 
-def upload_file(local_path, folder_name):
-    """上传单个文件到七牛（强制覆盖），返回 CDN URL。"""
-    key = "{}/{}/{}".format(CDN_PREFIX, folder_name, local_path.name)
-    token = q.upload_token(QINIU_BUCKET, key, 3600, policy={'insertOnly': 0})
-    ret, info = put_file_v2(token, key, str(local_path))
+def get_latest_version_dir(folder: Path):
+    """返回最新 v{N} 子目录和版本号，没有则返回 (None, 0)"""
+    max_v = 0
+    result = None
+    for d in folder.iterdir():
+        if d.is_dir():
+            m = re.match(r'^v(\d+)$', d.name)
+            if m:
+                v = int(m.group(1))
+                if v > max_v:
+                    max_v = v
+                    result = d
+    return result, max_v
+
+
+def upload_file(local_path: Path, cdn_key: str) -> str:
+    token = q.upload_token(QINIU_BUCKET, cdn_key, 3600, policy={'insertOnly': 0})
+    ret, info = put_file_v2(token, cdn_key, str(local_path))
     if info.status_code != 200:
-        raise RuntimeError("上传失败 {}: {}".format(local_path.name, info))
-    cdn_url = "{}/{}".format(CDN_DOMAIN, key)
+        raise RuntimeError('上传失败 {}: {}'.format(local_path.name, info))
+    cdn_url = '{}/{}'.format(CDN_DOMAIN, cdn_key)
     cdn_manager.refresh_urls([cdn_url])
     return cdn_url
 
 
-def publish(folder_path):
+def publish(folder_path: Path):
     folder_name = folder_path.name
-    files = [f for f in folder_path.iterdir() if f.is_file()]
+    version_dir, version_num = get_latest_version_dir(folder_path)
+
+    if not version_dir:
+        print('⚠️  {} 没有版本子目录，跳过'.format(folder_name))
+        return
+
+    version_str = 'v{}'.format(version_num)
+    files = [f for f in version_dir.rglob('*') if f.is_file() and f.name != '.sync-done']
 
     if not files:
-        print("⚠️  文件夹为空：{}".format(folder_path))
+        print('⚠️  文件夹为空: {}/{}'.format(folder_name, version_str))
         return
 
-    print("📂 发布文件夹：{}".format(folder_name))
+    print('📂 发布: {}/{}'.format(folder_name, version_str))
     for f in sorted(files):
-        cdn_url = upload_file(f, folder_name)
-        print("  ⬆️  {} → {}".format(f.name, cdn_url))
-
-    print("\n✅ 发布完成：{}".format(folder_name))
+        rel = f.relative_to(version_dir)
+        cdn_key = '{}/{}/{}/{}'.format(CDN_PREFIX, folder_name, version_str, rel.as_posix())
+        cdn_url = upload_file(f, cdn_key)
+        print('  ⬆️  {} → {}'.format(rel, cdn_url))
 
+    print('✅ 完成: {}/{}\n'.format(folder_name, version_str))
 
 
 def publish_index(pipeline_root: Path):
-    """重建 template-index.json 并上传到 CDN。"""
     index_script = pipeline_root / 'scripts' / 'build_template_index.py'
-    print("\n🔄 重建 template-index.json ...")
+    print('🔄 重建 template-index.json ...')
     subprocess.run(['python3', str(index_script)], check=True)
 
     index_file = pipeline_root / 'template-index.json'
     if not index_file.is_file():
-        print("⚠️  template-index.json 未生成，跳过上传")
+        print('⚠️  template-index.json 未生成，跳过上传')
         return
 
-    key = f"{CDN_PREFIX.rsplit('/templates', 1)[0]}/template-index.json"
-    token = q.upload_token(QINIU_BUCKET, key, 3600, policy={'insertOnly': 0})
-    ret, info = put_file_v2(token, key, str(index_file))
+    token = q.upload_token(QINIU_BUCKET, CDN_INDEX_KEY, 3600, policy={'insertOnly': 0})
+    ret, info = put_file_v2(token, CDN_INDEX_KEY, str(index_file))
     if info.status_code != 200:
-        raise RuntimeError(f"index 上传失败: {info}")
-    cdn_url = f"{CDN_DOMAIN}/{key}"
+        raise RuntimeError('index 上传失败: {}'.format(info))
+    cdn_url = '{}/{}'.format(CDN_DOMAIN, CDN_INDEX_KEY)
     cdn_manager.refresh_urls([cdn_url])
-    print(f"  ⬆️  已上传索引 → {cdn_url}")
+    print('  ⬆️  已上传索引 → {}'.format(cdn_url))
 
 
 def main():
@@ -98,15 +112,15 @@ def main():
         templates_dir = pipeline_root / 'templates'
         folders = sorted(d for d in templates_dir.iterdir() if d.is_dir())
         if not folders:
-            print("⚠️  templates/ 下没有找到任何模板文件夹")
+            print('⚠️  templates/ 下没有找到任何模板文件夹')
             sys.exit(0)
-        print(f"📦 共 {len(folders)} 个模板，开始全量发布...\n")
+        print('📦 共 {} 个模板，开始全量发布...\n'.format(len(folders)))
         for folder in folders:
             publish(folder)
     else:
         folder = Path(args.folder).expanduser().resolve()
         if not folder.is_dir():
-            print(f"❌ 路径不存在或不是文件夹: {folder}")
+            print('❌ 路径不存在或不是文件夹: {}'.format(folder))
             sys.exit(1)
         publish(folder)