@aiyiran/myclaw 1.1.185 → 1.1.186

package/package.json

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

package/skills/chat-history-extractor/SKILL.md

@@ -5,28 +5,23 @@ description: Extract and render chat history from OpenClaw session URLs. Use whe
 
 # Chat History Extractor
 
-## 支持的输入方式
-
-- **单个 URL/key**：处理一个会话
-- **逗号分隔**：`url1,url2,url3` 批量处理
-- **JSON 数组**：`["url1","url2","url3"]` 批量处理
-- **`--scan` 模式**：自动扫描所有 agent 的所有会话，统计表格
-
-## 快速使用（推荐）
+## 调用方式
 
 ```bash
-# 单个
-python3 scripts/extract_chat.py "<url>" <my-workspace>
-
-# 批量（逗号分隔）
-python3 scripts/extract_chat.py "url1,url2,url3" <my-workspace>
+# 只扫描：列出所有 agent 的所有会话，生成统计表格
+python3 scripts/extract_chat.py <my-workspace>
 
-# 批量（JSON 数组）
-python3 scripts/extract_chat.py '["url1","url2","url3"]' <my-workspace>
+# 扫描 + 提取：在扫描基础上，额外提取指定会话的完整对话
+python3 scripts/extract_chat.py <my-workspace> "<urls>"
 ```
 
-`<my-workspace>` 是**执行命令的 agent 自己的 workspace 路径**（不是被分析的对话所在的 workspace）。
-输出固定到 `<my-workspace>/chat-history/` 子目录。
+- `<my-workspace>`：**必填**，执行命令的 agent 自己的 workspace 路径（不是被分析对话所在的 workspace）
+- `<urls>`：可选，单个 URL/key、逗号分隔、或 JSON 数组
+- 输出固定到 `<my-workspace>/chat-history/` 子目录
+
+**两步执行逻辑**：
+1. **始终先扫描**所有 agent → 生成 `作品扫描_<时间>.html`
+2. 如果传了 `<urls>` → 再提取指定会话 → 生成 `index.js` + `index.html`
 
 ## 输出文件
 
@@ -113,21 +108,28 @@ URL 示例：`https://claw1.kekouen.cn/chat?session=agent%3Ac108-v1-1811%3Amain`
 
 ## 示例
 
-### 单个会话
+### 只扫描
+
+```bash
+python3 scripts/extract_chat.py /root/.openclaw/workspace-teacher
+```
+
+输出：`chat-history/作品扫描_<时间>.html`
+
+### 扫描 + 提取单个会话
 
 ```bash
-python3 scripts/extract_chat.py "https://claw1.kekouen.cn/chat?session=agent%3Ac108-v1-1811%3Amain" /root/.openclaw/workspace-teacher
+python3 scripts/extract_chat.py /root/.openclaw/workspace-teacher \
+  "https://claw1.kekouen.cn/chat?session=agent%3Ac108-v1-1811%3Amain"
 ```
 
-### 批量处理
+### 扫描 + 提取多个会话
 
 ```bash
-python3 scripts/extract_chat.py '[
+python3 scripts/extract_chat.py /root/.openclaw/workspace-teacher '[
   "https://claw6.kekouen.cn/chat?session=agent%3Axuexiji%3Amain",
-  "https://claw6.kekouen.cn/chat?session=agent%3Ausa%3Amain",
-  "https://claw6.kekouen.cn/chat?session=agent%3Ac109-v3-1813%3A...",
-  "https://claw6.kekouen.cn/chat?session=agent%3Ac108-v1-1810%3A..."
-]' /root/.openclaw/workspace-teacher
+  "https://claw6.kekouen.cn/chat?session=agent%3Ausa%3Amain"
+]'
 ```
 
-输出在 `<workspace>/chat-history/` 下：`index.js` + `index.html`。
+输出：`chat-history/作品扫描_<时间>.html` + `chat-history/index.js` + `chat-history/index.html`

package/skills/chat-history-extractor/scripts/extract_chat.py

@@ -433,12 +433,9 @@ def run_scan(output_dir=None, host=None):
 
 
 def main():
-    # Parse flags: --host HOST, --html, --scan
-    # Position: positional args (no --) come first, flags can be interleaved
     args = sys.argv[1:]
 
     host = detect_chat_host()
-    scan_mode = False
     positional = []
 
     i = 0
@@ -447,84 +444,69 @@ def main():
         if a == '--host' and i + 1 < len(args):
             host = args[i + 1]
             i += 2
-
-        elif a == '--scan':
-            scan_mode = True
-            i += 1
         else:
             positional.append(a)
             i += 1
 
-    if not positional and not scan_mode:
+    if len(positional) == 0 or len(positional) > 2:
         print("Usage:")
-        print("  python3 extract_chat.py <url-or-key> <workspace> [--host HOST]")
-        print("  python3 extract_chat.py 'url1,url2,url3' <workspace> [--host HOST]")
-        print('  python3 extract_chat.py \'["url1","url2"]\' <workspace> [--host HOST]')
-        print("  python3 extract_chat.py --scan <workspace> [--host HOST]")
-        print("\n  <workspace>  执行命令的 agent 自己的 workspace 路径")
+        print("  python3 extract_chat.py <workspace> [--host HOST]")
+        print("  python3 extract_chat.py <workspace> '<urls>' [--host HOST]")
+        print("")
+        print("  <workspace>  执行命令的 agent 自己的 workspace 路径")
+        print("  <urls>       可选。单个 URL/key，逗号分隔，或 JSON 数组")
+        print("               不传则只扫描；传了则扫描后再提取指定会话")
         print("  输出固定到: <workspace>/%s/" % REPORT_SUBDIR)
-        print("\nFlags:")
-        print("  --host HOST     Override chat host (default: auto-detect from config.json)")
-        print("  --scan          Scan all agents")
+        print("")
+        print("Flags:")
+        print("  --host HOST  Override chat host (default: auto-detect from config.json)")
         sys.exit(1)
 
-    # --scan mode
-    if scan_mode:
-        if len(positional) != 1:
-            print("ERROR: --scan takes exactly 1 argument: <workspace>")
-            print("  --scan auto-scans all agents, no scan path needed")
-            sys.exit(1)
-        workspace = positional[0]
-        output_dir = os.path.join(workspace, REPORT_SUBDIR)
-        run_scan(output_dir, host=host)
-        return
-
-    # Normal mode: first arg = urls, second arg = workspace
-    if len(positional) != 2:
-        print("ERROR: expected exactly 2 arguments: <urls> <workspace>")
-        sys.exit(1)
-    arg1 = positional[0]
-    workspace = positional[1]
+    workspace = positional[0]
     output_dir = os.path.join(workspace, REPORT_SUBDIR)
-    items = parse_input(arg1)
-    print("Input: %d session(s)" % len(items))
-    print("Host: %s" % detect_chat_host())
-
     os.makedirs(output_dir, exist_ok=True)
 
-    # 清理旧产物（含历史遗留的单会话 js）后再重新生成
-    for old_f in os.listdir(output_dir):
-        if old_f.endswith('.js') or old_f == 'index.html':
-            try:
-                os.remove(os.path.join(output_dir, old_f))
-            except Exception:
-                pass
-
-    results = []
-    for i, item in enumerate(items, 1):
-        r = process_one(item, output_dir, i)
-        if r:
-            results.append(r)
-
-    if not results:
-        print("\nERROR: No sessions processed successfully.")
-        sys.exit(1)
-
-    # 唯一数据产物：index.js（chatIndex + chatAll）
-    generate_index_js(results, output_dir)
+    # Step 1: 始终扫描所有 agent
+    print("=== Step 1: 扫描所有 agent ===")
+    run_scan(output_dir, host=host)
+
+    # Step 2: 如果传了 urls，提取指定会话
+    if len(positional) == 2:
+        print("\n=== Step 2: 提取指定会话 ===")
+        urls = positional[1]
+        items = parse_input(urls)
+        print("Input: %d session(s)" % len(items))
+        print("Host: %s" % host)
+
+        # 清理旧产物
+        for old_f in os.listdir(output_dir):
+            if old_f.endswith('.js') or old_f == 'index.html':
+                try:
+                    os.remove(os.path.join(output_dir, old_f))
+                except Exception:
+                    pass
+
+        results = []
+        for i, item in enumerate(items, 1):
+            r = process_one(item, output_dir, i)
+            if r:
+                results.append(r)
+
+        if not results:
+            print("\nERROR: No sessions processed successfully.")
+            sys.exit(1)
 
-    # Copy chat-history-template.html as index.html
-    import shutil
-    tpl_path = os.path.join(_get_script_dir(), '..', 'assets', 'chat-history-template.html')
-    if os.path.exists(tpl_path):
-        shutil.copy2(tpl_path, os.path.join(output_dir, 'index.html'))
-        print("View: %s" % os.path.join(output_dir, 'index.html'))
+        generate_index_js(results, output_dir)
 
-    # Summary table
-    print_summary_table(results, host)
+        import shutil
+        tpl_path = os.path.join(_get_script_dir(), '..', 'assets', 'chat-history-template.html')
+        if os.path.exists(tpl_path):
+            shutil.copy2(tpl_path, os.path.join(output_dir, 'index.html'))
+            print("View: %s" % os.path.join(output_dir, 'index.html'))
 
-    total_pairs = sum(r['total_pairs'] for r in results)
-    print("\n合计：%d 个会话，%d 对对话。" % (len(results), total_pairs))
+        print_summary_table(results, host)
+        total_pairs = sum(r['total_pairs'] for r in results)
+        print("\n合计：%d 个会话，%d 对对话。" % (len(results), total_pairs))
 
 
 if __name__ == '__main__':