@aiyiran/myclaw 1.1.20 → 1.1.22

package/.claude/settings.local.json

@@ -5,7 +5,23 @@
       "Bash(python3 -c \"import json,sys; d=json.load\\(sys.stdin\\); agents=d.get\\('agents',{}\\).get\\('list',[]\\); [print\\(a.get\\('id'\\), '|', a.get\\('workspace',''\\)\\) for a in agents if a]\")",
       "Bash(node *)",
       "Bash(curl -s \"https://cdn.bootcdn.net/ajax/libs/qrcodejs/1.0.0/qrcode.min.js\" -o /Users/yiran/.openclaw/workspace-yiranclaw/myclaw/assets/qrcode.min.js)",
-      "Bash(python3 *)"
+      "Bash(python3 *)",
+      "Bash(crontab -l)",
+      "Bash(launchctl list *)",
+      "Bash(claude config *)",
+      "Bash(defaults read *)",
+      "Bash(chmod +x *)",
+      "Bash(/usr/local/bin/claude config *)",
+      "Bash(claude --version)",
+      "Bash(mc --version)",
+      "Bash(mc server *)",
+      "Bash(kill %1)",
+      "Bash(wait)",
+      "Bash(CLAW_NAME=yiran timeout 6 python3 server/sync_workspace.py)",
+      "Bash(curl -s http://127.0.0.1:18800/api/artifacts?workspace=workspace)",
+      "Bash(curl *)",
+      "Bash(find /Users/yiran/.openclaw/workspace/ -not -path '*/.git/*' -not -path '*/.myclaw/*' -not -path '*/node_modules/*' -not -path '*/__pycache__/*' -type f -exec du -ch {} +)",
+      "Bash(find *)"
     ]
   }
 }

package/assets/myclaw-artifacts.js

@@ -95,15 +95,19 @@
   }
 
   // ═══ 构建预览 URL ═══
-  // 统一走 CDN，clawName 实时派生，wsPrefix 实时从当前 URL 计算
+  // 统一走 CDN，clawName 只从两个可信来源取：
+  //   远程 → hostname 派生（detectEnvironment）
+  //   本地 → resolveClawName() 缓存的 lastKnownClawName
   function buildPreviewUrl(data, assetPath) {
     var env = detectEnvironment();
-    var clawName = env.remote ? env.clawName : lastKnownClawName;
     var wsPrefix = getWorkspaceId();
-    if (!clawName || !wsPrefix) {
+    var clawName = env.remote ? env.clawName : lastKnownClawName;
+
+    if (!clawName) {
       console.error('[myclaw-artifacts] ❌ clawName 未就绪，无法构建预览链接');
       return null;
     }
+
     return 'https://cdn.yiranlaoshi.com/' + clawName + '/' + wsPrefix + '/' + assetPath;
   }
 
@@ -193,6 +197,42 @@
     var headerRight = document.createElement('span');
     headerRight.style.cssText = 'display:flex;align-items:center;gap:10px;';
 
+    // 刷新按钮（全量同步）
+    var resyncBtn = document.createElement('span');
+    resyncBtn.textContent = '\uD83D\uDD04';
+    resyncBtn.title = '\u5237\u65B0\u540C\u6B65';
+    resyncBtn.style.cssText = 'cursor:pointer;padding:2px 6px;border-radius:3px;font-size:13px;transition:all 0.15s;';
+    resyncBtn.onmouseenter = function () { resyncBtn.style.background = 'rgba(255,255,255,0.1)'; };
+    resyncBtn.onmouseleave = function () { if (!resyncBtn._syncing) resyncBtn.style.background = 'none'; };
+    resyncBtn.onclick = function () {
+      if (resyncBtn._syncing) return;
+      resyncBtn._syncing = true;
+      resyncBtn.style.animation = 'myclaw-spin 1s linear infinite';
+      resyncBtn.style.background = 'rgba(255,255,255,0.1)';
+
+      var wsPrefix = getWorkspaceId();
+      fetch(MYCLAW_API_BASE + '/api/resync?workspace=' + encodeURIComponent(wsPrefix), { method: 'POST' })
+        .then(function (res) { return res.json(); })
+        .then(function (data) {
+          if (data.ok) {
+            console.log('[myclaw-artifacts] \u2705 \u540C\u6B65\u5B8C\u6210');
+            var contentEl = document.querySelector('#myclaw-artifacts-content');
+            if (contentEl) fetchArtifacts(contentEl);
+          } else {
+            console.error('[myclaw-artifacts] \u274C \u540C\u6B65\u5931\u8D25:', data.error);
+          }
+        })
+        .catch(function (err) {
+          console.error('[myclaw-artifacts] \u274C \u540C\u6B65\u8BF7\u6C42\u5931\u8D25:', err.message);
+        })
+        .then(function () {
+          resyncBtn._syncing = false;
+          resyncBtn.style.animation = '';
+          resyncBtn.style.background = 'none';
+        });
+    };
+    headerRight.appendChild(resyncBtn);
+
     // 展示间跳转（发布按钮左边）
     var showcaseLink = document.createElement('a');
     var _scEnv = detectEnvironment();
@@ -289,49 +329,40 @@
   }
 
   function fetchArtifactsFromLocalAPI(wsPrefix) {
-    return fetch(MYCLAW_API_BASE + '/api/artifacts?workspace=' + encodeURIComponent(wsPrefix))
+    var url = MYCLAW_API_BASE + '/api/artifacts?workspace=' + encodeURIComponent(wsPrefix);
+    console.log('[myclaw-artifacts] [1/3] 尝试 LocalAPI:', url);
+    return fetch(url)
       .then(function (res) {
         if (!res.ok) throw new Error('HTTP ' + res.status);
         return res.json();
+      })
+      .then(function (data) {
+        console.log('[myclaw-artifacts] ✅ LocalAPI 成功，assets:', (data.assets || []).length);
+        return data;
       });
   }
 
-  function fetchArtifactsFromCDN(wsPrefix, clawName) {
-    if (!clawName) return Promise.reject(new Error('no claw name'));
-    var url = 'https://cdn.yiranlaoshi.com/' + clawName + '/' + wsPrefix + '/.myclaw/__MY_ARTIFACTS__.json?t=' + Date.now();
-    return fetch(url).then(function (res) {
-      if (!res.ok) throw new Error('HTTP ' + res.status);
-      return res.text();
-    }).then(function (text) {
-      if (text.trim().indexOf('<') === 0) throw new Error('Not JSON');
-      return JSON.parse(text);
-    });
-  }
-
   function fetchArtifactsFromServerAPI(wsPrefix) {
     var url = window.location.origin + '/cmd/api/preview?path=' + encodeURIComponent(wsPrefix + '/.myclaw/__MY_ARTIFACTS__.json');
+    console.log('[myclaw-artifacts] [2/2] 尝试 ServerAPI:', url);
     return fetch(url).then(function (res) {
       if (!res.ok) throw new Error('HTTP ' + res.status);
       return res.json();
+    }).then(function (data) {
+      console.log('[myclaw-artifacts] ✅ ServerAPI 成功');
+      return data;
     });
   }
 
   function fetchArtifacts(contentEl) {
-    var env = detectEnvironment();
     var wsPrefix = getWorkspaceId();
-    var fetcher;
 
-    if (env.remote) {
-      // 远程服务器 → 走 /cmd/api
-      fetcher = fetchArtifactsFromServerAPI(wsPrefix);
-    } else {
-      // 本地环境 → 实时拿 clawName → 走 CDN
-      fetcher = resolveClawName().then(function (clawName) {
-        return fetchArtifactsFromCDN(wsPrefix, clawName);
-      });
-    }
-
-    fetcher
+    // LocalAPI → ServerAPI（两层降级，不走 CDN）
+    fetchArtifactsFromLocalAPI(wsPrefix)
+      .catch(function (err) {
+        console.warn('[myclaw-artifacts] ❌ LocalAPI 失败:', err.message, '→ 降级 ServerAPI');
+        return fetchArtifactsFromServerAPI(wsPrefix);
+      })
       .then(function (data) {
         cachedData = data;
         if (!contentEl) return;
@@ -341,7 +372,8 @@
         }
         renderArtifactsList(contentEl, data);
       })
-      .catch(function () {
+      .catch(function (err) {
+        console.error('[myclaw-artifacts] ❌ 全部失败:', err.message);
         if (contentEl) {
           contentEl.innerHTML = '<div style="text-align:center;padding:32px;color:#888;">暂无作品</div>';
         }
@@ -511,6 +543,22 @@
     if (document.querySelector('#myclaw-artifacts-preview')) return;
 
     var previewUrl = buildPreviewUrl(data, asset.path);
+    if (!previewUrl) {
+      console.log('[myclaw-artifacts] ↻ clawName 未就绪，尝试重新获取一次...');
+      resolveClawName()
+        .then(function () {
+          var retriedPreviewUrl = buildPreviewUrl(data, asset.path);
+          if (!retriedPreviewUrl) {
+            console.error('[myclaw-artifacts] ❌ clawName 重试获取后仍未就绪，无法打开预览');
+            return;
+          }
+          openPreviewModal(data, asset);
+        })
+        .catch(function (err) {
+          console.error('[myclaw-artifacts] ❌ clawName 重试获取失败:', err && err.message ? err.message : err);
+        });
+      return;
+    }
 
     var overlay = document.createElement('div');
     overlay.id = 'myclaw-artifacts-preview';
@@ -1178,6 +1226,35 @@
     if (modal) modal.remove();
   }
 
+  // ═══ Fork 辅助函数 ═══
+  function onForkError(err, btn, input) {
+    console.error('[myclaw-fork]', err);
+    btn.disabled = false;
+    input.disabled = false;
+    btn.textContent = '\u274C 失败，点击重试';
+    btn.style.background = '#7a2a2a';
+    btn.style.cursor = 'pointer';
+    setTimeout(function () {
+      btn.textContent = '\u786E\u8BA4 Fork';
+      btn.style.background = '#4a4a7a';
+    }, 2500);
+  }
+
+  function showForkDoneToast(workspace, files) {
+    var toast = document.createElement('div');
+    toast.style.cssText = [
+      'position:fixed', 'bottom:32px', 'right:24px', 'z-index:999999',
+      'background:#10b981', 'color:#fff', 'padding:14px 20px',
+      'border-radius:8px', 'font-family:monospace', 'font-size:13px',
+      'box-shadow:0 4px 16px rgba(0,0,0,0.3)',
+      'animation:myclaw-slide-in-right 0.25s ease',
+    ].join(';');
+    toast.innerHTML = '\u2705 Fork 完成！<br>'
+      + '<span style="opacity:0.85;font-size:11px;">' + workspace + '（' + files + ' 个文件）</span>';
+    document.body.appendChild(toast);
+    setTimeout(function () { toast.remove(); }, 4000);
+  }
+
   // ═══ Fork 他人作品弹框 ═══
   function openForkModal() {
     if (document.querySelector('#myclaw-fork-modal')) return;
@@ -1305,12 +1382,12 @@
       errVisible = false;
 
       forkSubmitBtn.disabled = true;
-      forkSubmitBtn.textContent = '\u23F3 \u7B49\u5F85\u4E2D...';
+      forkSubmitBtn.textContent = '\u23F3 Fork 中...';
       forkSubmitBtn.style.background = '#3a3a5a';
       forkSubmitBtn.style.cursor = 'default';
       urlInput.disabled = true;
 
-      fetch('https://claw.kekouen.cn/sync', {
+      fetch(MYCLAW_API_BASE + '/api/fork', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ url: url }),
@@ -1319,22 +1396,35 @@
           if (!res.ok) throw new Error('HTTP ' + res.status);
           return res.json();
         })
-        .then(function () {
-          forkSubmitBtn.textContent = '\u2705 Fork \u6210\u529F\uFF01';
-          forkSubmitBtn.style.background = '#10b981';
-          setTimeout(function () { closeForkModal(); }, 2000);
+        .then(function (data) {
+          if (!data.job_id) throw new Error(data.error || 'no job_id');
+          // 轮询 job 状态
+          var jobId = data.job_id;
+          var timer = setInterval(function () {
+            fetch(MYCLAW_API_BASE + '/api/fork/status?job_id=' + encodeURIComponent(jobId))
+              .then(function (r) { return r.json(); })
+              .then(function (job) {
+                if (job.status === 'running') return;
+                clearInterval(timer);
+                if (job.status === 'done') {
+                  forkSubmitBtn.textContent = '\u2705 Fork 成功！';
+                  forkSubmitBtn.style.background = '#10b981';
+                  setTimeout(function () {
+                    closeForkModal();
+                    showForkDoneToast(job.workspace, job.files);
+                  }, 800);
+                } else {
+                  throw new Error(job.error || 'failed');
+                }
+              })
+              .catch(function (err) {
+                clearInterval(timer);
+                onForkError(err, forkSubmitBtn, urlInput);
+              });
+          }, 1500);
         })
         .catch(function (err) {
-          console.error('[myclaw-fork]', err);
-          forkSubmitBtn.disabled = false;
-          urlInput.disabled = false;
-          forkSubmitBtn.textContent = '\u274C \u8BF7\u6C42\u5931\u8D25\uFF0C\u70B9\u51FB\u91CD\u8BD5';
-          forkSubmitBtn.style.background = '#7a2a2a';
-          forkSubmitBtn.style.cursor = 'pointer';
-          setTimeout(function () {
-            forkSubmitBtn.textContent = '\u786E\u8BA4 Fork';
-            forkSubmitBtn.style.background = '#4a4a7a';
-          }, 2500);
+          onForkError(err, forkSubmitBtn, urlInput);
         });
     };
 
@@ -1369,6 +1459,10 @@
       '  from { transform: scale(0.7); opacity: 0; }',
       '  to { transform: scale(1); opacity: 1; }',
       '}',
+      '@keyframes myclaw-spin {',
+      '  from { transform: rotate(0deg); }',
+      '  to { transform: rotate(360deg); }',
+      '}',
     ].join('\n');
     document.head.appendChild(style);
   }
@@ -1377,6 +1471,8 @@
   function init() {
     injectStyles();
     createArtifactsButton();
+    // 本地环境：启动时获取一次 clawName 并缓存，轮询期间复用
+    resolveClawName();
     startPolling();
     var env = detectEnvironment();
     console.log('[myclaw-artifacts] ✅ 初始化完成 (' + (env.remote ? '远程: ' + env.clawName : '本地') + ')');

package/index.js

@@ -301,9 +301,12 @@ function runNew() {
   const NC = colors.nc;
 
   // 支持两种调用：
-  //   mc new          → 交互输入名字
-  //   mc new <name>   → 直接使用传入的名字
+  //   mc new                              → 交互输入名字
+  //   mc new <name>                       → 直接使用传入的名字
+  //   mc new <name> --first-message "..." → 自定义首条消息
   const rawName = args[1];
+  const firstMessageIdx = args.indexOf('--first-message');
+  const customFirstMessage = firstMessageIdx !== -1 ? args[firstMessageIdx + 1] : null;
 
   if (rawName) {
     doCreate(rawName);
@@ -371,7 +374,8 @@ function runNew() {
 
     var result;
     try {
-      result = require('./create_agent').createAgent(input);
+      const createOpts = customFirstMessage ? { firstMessage: customFirstMessage } : {};
+      result = require('./create_agent').createAgent(input, createOpts);
     } catch (err) {
       console.log(R + '创建失败: ' + err.message + NC);
       process.exit(1);
@@ -1763,6 +1767,7 @@ function runSync(workspaceName) {
   const targetPyPath = path.join(targetDir, 'sync_workspace.py');
   const targetConfigPath = path.join(targetDir, 'config.json');
   const sourcePyPath = path.join(__dirname, 'server', 'sync_workspace.py');
+  const sourceSchemaPath = path.join(__dirname, 'server', 'artifacts_schema.py');
 
   // 确保目标目录存在
   if (!fs.existsSync(targetDir)) {
@@ -1771,6 +1776,7 @@ function runSync(workspaceName) {
 
   // 同步 py 文件
   fs.copyFileSync(sourcePyPath, targetPyPath);
+  fs.copyFileSync(sourceSchemaPath, path.join(targetDir, 'artifacts_schema.py'));
 
   // 读取配置（如果不存在则创建）
   let config;
@@ -1812,8 +1818,11 @@ async function runServer(name) {
   // 用户目录下的服务目录
   const targetDir = path.join(os.homedir(), '.openclaw', 'myclaw', 'server');
   const targetPyPath = path.join(targetDir, 'sync_workspace.py');
+  const targetGuardPath = path.join(targetDir, 'myclaw-guard.sh');
   const targetConfigPath = path.join(targetDir, 'config.json');
   const sourcePyPath = path.join(__dirname, 'server', 'sync_workspace.py');
+  const sourceSchemaPath = path.join(__dirname, 'server', 'artifacts_schema.py');
+  const sourceGuardPath = path.join(__dirname, 'server', 'myclaw-guard.sh');
   const pidFile = path.join(os.homedir(), '.openclaw', '.myclaw-sync.pid');
 
   // 0. 杀死旧的 sync_workspace 进程（通过 PID 文件）
@@ -1828,15 +1837,36 @@ async function runServer(name) {
     try { fs.unlinkSync(pidFile); } catch (e) { }
   }
 
+  // 0.5 清理竞争者：/root/sync_workspace.py
+  const rivalPath = '/root/sync_workspace.py';
+  try {
+    // 先杀掉所有运行该脚本的进程
+    try {
+      execSyncLocal('pkill -f "' + rivalPath + '" 2>/dev/null || true', { shell: true, stdio: 'pipe' });
+      console.log('[Server] 已终止竞争进程: ' + rivalPath);
+    } catch (e) { /* 无进程时忽略 */ }
+    // 再删除文件
+    if (fs.existsSync(rivalPath)) {
+      fs.unlinkSync(rivalPath);
+      console.log('[Server] 已删除竞争脚本: ' + rivalPath);
+    }
+  } catch (e) {
+    console.log('[Server] 清理竞争者失败（可忽略）: ' + e.message);
+  }
+
   // 1. 创建目标目录
   if (!fs.existsSync(targetDir)) {
     fs.mkdirSync(targetDir, { recursive: true });
     console.log('[Server] 创建目录: ' + targetDir);
   }
 
-  // 2. 覆盖 py 文件（确保最新）
+  // 2. 覆盖 py 文件 & guard 脚本（确保最新）
   fs.copyFileSync(sourcePyPath, targetPyPath);
+  fs.copyFileSync(sourceSchemaPath, path.join(targetDir, 'artifacts_schema.py'));
   console.log('[Server] 同步脚本: ' + targetPyPath);
+  fs.copyFileSync(sourceGuardPath, targetGuardPath);
+  fs.chmodSync(targetGuardPath, 0o755);
+  console.log('[Server] 守卫脚本: ' + targetGuardPath);
 
   // 3. 确保配置文件存在（如果已有就不动）
   let config;
@@ -1950,6 +1980,7 @@ function showHelp() {
   console.log('  inject-workspaceAndSoul 替换默认 workspace 的 SOUL.md 提示词');
   console.log('  inject-tooldeny         deny image_generate + music_generate 内置工具');
   console.log('  inject-controlui        注入 controlUi 配置 (allowInsecureAuth + allowedOrigins)');
+  console.log('  all        完整升级: up + patch + server + restart');
   console.log('  restart    重启 OpenClaw Gateway');
   console.log('  nuke       ⚠️  核弹重置 (需加 --dangerous): 清除数据 + onboard + up + patch + restart');
   console.log('  help       显示帮助信息');
@@ -2007,6 +2038,24 @@ if (!command) {
   if (detectPlatform() === 'windows') {
     runBat();
   }
+} else if (command === 'all') {
+  // 完整升级：升级包 → patch → server → restart
+  console.log('[mc all] 开始完整升级流程...');
+  console.log('');
+  console.log('[1/4] mc up — 升级包 + patch');
+  runUpdate();
+  runPatch();
+  if (detectPlatform() === 'windows') {
+    runBat();
+  }
+  console.log('');
+  console.log('[2/4] mc restart — 重启 Gateway');
+  runRestart();
+  console.log('');
+  console.log('[3/4] mc server — 更新 Python 守护进程');
+  runServer(args[1]);
+  console.log('');
+  console.log('[4/4] 完成 ✅');
 } else if (command === 'start') {
   runStart();
 } else if (command === 'open') {

package/package.json

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

package/server/artifacts_schema.py

@@ -0,0 +1,32 @@
+"""
+__MY_ARTIFACTS__.json 的统一初始结构定义
+
+所有需要创建或读取 artifacts 配置的模块都应使用此处的函数，
+确保字段一致。
+"""
+
+from datetime import datetime, timezone, timedelta
+
+ARTIFACTS_FILENAME = "__MY_ARTIFACTS__.json"
+
+
+def now_iso():
+    """生成 +08:00 时间格式"""
+    tz = timezone(timedelta(hours=8))
+    return datetime.now(tz).isoformat()
+
+
+def create_empty_artifacts(workspace_id, base_url=""):
+    """创建空的 artifacts 初始结构（以 registry.py 为准）"""
+    now = now_iso()
+    return {
+        "workspace_id": workspace_id,
+        "title": "我的资源库",
+        "release_version": 1,
+        "created_at": now,
+        "updated_at": now,
+        "version": 1,
+        "base_url": base_url,
+        "preview_path": "index.html",
+        "assets": []
+    }