@aiyiran/myclaw 1.0.219 → 1.0.221

package/package.json

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

package/patches/patch.js

@@ -121,7 +121,7 @@ function patch() {
   const version = getMyclawVersion();
 
   console.log('[myclaw-patch] → control-ui: ' + uiDir);
-  console.log('[myclaw-patch] → MyClaw v' + version);
+  console.log('[myclaw-patch] → MyClaw v' + version + ' (patch-engine: 2026.04.14)');
 
   // 1. 备份原始 index.html（仅首次）
   if (!fs.existsSync(backupPath)) {
@@ -230,11 +230,14 @@ function patch() {
       const filePath = path.join(distParent, f);
       let content = fs.readFileSync(filePath, 'utf8');
 
-      // 检查是否需要 patch
+      // 检查是否需要 patch（分别检测每项，避免部分已 patch 导致整体跳过）
       const needsMicrophonePatch = content.includes('microphone=()');
-      const needsCspFramePatch = !content.includes('frame-src');
+      const needsFrameSrc = !content.includes('"frame-src');
+      const needsConnectSrc = content.includes('"connect-src \'self\' ws: wss:"');
+      const needsFrameAncestors = content.includes('"frame-ancestors \'none\'"');
+      const needsAnyCspPatch = needsFrameSrc || needsConnectSrc || needsFrameAncestors;
 
-      if (needsMicrophonePatch || needsCspFramePatch) {
+      if (needsMicrophonePatch || needsAnyCspPatch) {
         // 备份
         const backupFile = filePath + BACKUP_SUFFIX;
         if (!fs.existsSync(backupFile)) {
@@ -251,31 +254,39 @@ function patch() {
         }
 
         // Patch 2: CSP - 在 buildControlUiCspHeader 的 CSP 数组中放宽限制
-        // 原始: "default-src 'self'", "connect-src 'self' ws: wss:", "frame-ancestors 'none'"
-        // 目标: 添加 frame-src, 放开 connect-src 和 frame-ancestors
-        if (needsCspFramePatch) {
-          // 添加 frame-src 指令（允许 iframe 加载外部 https 资源）
+        const cspPatches = [];
+        // 添加 frame-src 指令（允许 iframe 加载外部 https 资源）
+        if (needsFrameSrc) {
           content = content.replace(
             '"default-src \'self\'"',
             '"default-src \'self\'",\n\t\t"frame-src \'self\' https:"'
           );
-          // 放开 connect-src，允许 fetch/XHR 到外部 https API
+          cspPatches.push('frame-src');
+        }
+        // 放开 connect-src，允许 fetch/XHR 到外部 https API
+        if (needsConnectSrc) {
           content = content.replace(
             '"connect-src \'self\' ws: wss:"',
             '"connect-src \'self\' https: ws: wss:"'
           );
-          // 放开 frame-ancestors，允许被外部 https 页面嵌入
+          cspPatches.push('connect-src');
+        }
+        // 放开 frame-ancestors，允许被外部 https 页面嵌入
+        if (needsFrameAncestors) {
           content = content.replace(
             '"frame-ancestors \'none\'"',
             '"frame-ancestors \'self\' https:"'
           );
-          console.log('[myclaw-patch] ✅ 已修复 CSP (frame-src, connect-src, frame-ancestors): ' + f);
+          cspPatches.push('frame-ancestors');
+        }
+        if (cspPatches.length > 0) {
+          console.log('[myclaw-patch] ✅ 已修复 CSP (' + cspPatches.join(', ') + '): ' + f);
         }
 
         fs.writeFileSync(filePath, content, 'utf8');
         patched = true;
       } else {
-        console.log('[myclaw-patch] ✅ Permissions-Policy (microphone) 和 CSP (frame-src) 已是允许状态');
+        console.log('[myclaw-patch] ✅ Permissions-Policy 和 CSP 已是允许状态 (无需修改): ' + f);
         patched = true;
       }
     }