@aiyiran/myclaw 1.1.136 → 1.1.138

package/assets/myclaw-artifacts.js

@@ -808,8 +808,14 @@
         'background: #252536',
       ].join(';');
 
-      // fetch → blob URL，绕过 CSP img-src 限制
+      // 远程环境：走 CDN（边缘缓存，速度快，不受本机出口带宽限制）
+      // 本地环境：走本地 API（文件尚未同步到 CDN）
+      // CSP img-src 限制后续在服务端统一放行，此处不做 blob 绕行
       var img = document.createElement('img');
+      var _imgEnv = detectEnvironment();
+      img.src = _imgEnv.remote
+        ? previewUrl + '?t=' + Date.now()
+        : MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(getWorkspaceId() + '/' + asset.path) + '&t=' + Date.now();
       img.alt = asset.name || asset.path;
       img.style.cssText = [
         'max-width: 100%',
@@ -820,28 +826,13 @@
         'position: relative',
         'z-index: 1',
       ].join(';');
-
-      function showImgError() {
+      img.onerror = function () {
         img.style.display = 'none';
         var errMsg = document.createElement('div');
         errMsg.textContent = '加载失败';
         errMsg.style.cssText = 'color:#666;font-size:13px;font-family:monospace;';
         imgArea.appendChild(errMsg);
-      }
-
-      var localImgUrl = MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(getWorkspaceId() + '/' + asset.path) + '&t=' + Date.now();
-      fetch(localImgUrl)
-        .then(function (r) {
-          if (!r.ok) throw new Error('HTTP ' + r.status);
-          return r.blob();
-        })
-        .then(function (blob) {
-          var blobUrl = URL.createObjectURL(blob);
-          img.onload = function () { URL.revokeObjectURL(blobUrl); };
-          img.onerror = showImgError;
-          img.src = blobUrl;
-        })
-        .catch(showImgError);
+      };
 
       imgArea.appendChild(img);
       imgBox.appendChild(imgArea);
@@ -1179,11 +1170,17 @@
       var isVideo = VIDEO_EXTS.indexOf(assetExt) !== -1;
 
       if (isVideo) {
-        // 视频用 <video> 元素 + 本地 API，支持流式加载和拖拽进度条
+        // <video> 元素支持 range 请求，流式加载，可拖拽进度条，不用 iframe
+        // 远程环境：走 CDN（带宽快，不受本机出口限制）
+        // 本地环境：走本地 API（文件尚未同步到 CDN）
+        // CSP media-src 限制后续在服务端统一放行
         var video = document.createElement('video');
         video.controls = true;
         video.style.cssText = 'flex:1;width:100%;max-height:100%;background:#000;outline:none;';
-        video.src = MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(getWorkspaceId() + '/' + asset.path);
+        var _videoEnv = detectEnvironment();
+        video.src = _videoEnv.remote
+          ? previewUrl + '?t=' + Date.now()
+          : MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(getWorkspaceId() + '/' + asset.path);
         box.appendChild(video);
         overlay.appendChild(box);
         document.body.appendChild(overlay);

package/assets/myclaw-inject.js

@@ -784,6 +784,211 @@ btn.addEventListener("click", function () {
     });
   }
 
+  // ═══ 7.5 右下角"新会话"按钮（支持中文命名） ═══
+  //
+  // 实现思路（复用原生机制，避免重写会话切换逻辑）：
+  //   1. 点击我们的按钮 → 弹框输入中文名
+  //   2. 程序点击 openclaw 原生"新会话"按钮（藏在 openclaw-app 的 shadow DOM 里），
+  //      由它负责"创建 + 无刷新切换"——这套逻辑（zH/BH）是模块私有的，外部无法直接调用
+  //   3. 轮询 openclaw-app.sessionKey，等它从旧值变为新会话的 key
+  //   4. 通过 openclaw-app.client（WebSocket RPC）发 sessions.patch 把 label 改成中文名
+  //      服务端 patch 后会广播 sessions.changed，前端订阅会自动刷新侧栏显示，无需手动刷新
+
+  var newSessionOpen = false;
+
+  // 获取 openclaw 根组件（上面挂着 WebSocket client 和 sessionKey）
+  function getOpenclawApp() {
+    return document.querySelector("openclaw-app");
+  }
+
+  // 在 shadow DOM（含嵌套）里深度查找元素
+  function deepQuerySelector(root, selector) {
+    if (!root) return null;
+    var direct = root.querySelector ? root.querySelector(selector) : null;
+    if (direct) return direct;
+    var all = root.querySelectorAll ? root.querySelectorAll("*") : [];
+    for (var i = 0; i < all.length; i++) {
+      if (all[i].shadowRoot) {
+        var found = deepQuerySelector(all[i].shadowRoot, selector);
+        if (found) return found;
+      }
+    }
+    return null;
+  }
+
+  // 找到原生"新会话"按钮（先 light DOM，再 app 的 shadow DOM 深搜）
+  function findNativeNewSessionBtn() {
+    var sel = ".sidebar-new-session";
+    var el = document.querySelector(sel);
+    if (el) return el;
+    var app = getOpenclawApp();
+    if (app && app.shadowRoot) {
+      return deepQuerySelector(app.shadowRoot, sel);
+    }
+    return null;
+  }
+
+  // 从 sessionKey 解析 agentId（格式 agent:NAME:...），非 agent 会话返回 null
+  function deriveAgentId(sessionKey) {
+    if (typeof sessionKey === "string" && sessionKey.indexOf("agent:") === 0) {
+      var parts = sessionKey.split(":");
+      if (parts.length >= 2 && parts[1]) return parts[1];
+    }
+    return null;
+  }
+
+  // 轮询等待 sessionKey 变化（原生按钮创建+切换后，key 会变成新会话）
+  function waitForSessionChange(app, prevKey, timeoutMs) {
+    return new Promise(function (resolve) {
+      var start = Date.now();
+      (function poll() {
+        if (app.sessionKey && app.sessionKey !== prevKey) { resolve(app.sessionKey); return; }
+        if (Date.now() - start > timeoutMs) { resolve(null); return; }
+        setTimeout(poll, 80);
+      })();
+    });
+  }
+
+  // 创建一个带中文名的新会话
+  function createNamedSession(label) {
+    var app = getOpenclawApp();
+    if (!app) { showToast("未找到 openclaw 应用", "error"); return; }
+    if (!app.client) { showToast("网关未连接", "error"); return; }
+
+    var nativeBtn = findNativeNewSessionBtn();
+    if (!nativeBtn) { showToast("未找到原生新会话按钮", "error"); return; }
+    if (nativeBtn.disabled) { showToast("当前无法新建（有进行中的任务？）", "error"); return; }
+
+    var prevKey = app.sessionKey;
+    showToast("正在创建：" + label);
+
+    // 由原生按钮负责创建 + 切换
+    nativeBtn.click();
+
+    waitForSessionChange(app, prevKey, 8000).then(function (newKey) {
+      if (!newKey) { showToast("新会话创建超时", "error"); return; }
+      // 改名
+      var params = { key: newKey, label: label };
+      var agentId = deriveAgentId(newKey);
+      if (agentId) params.agentId = agentId;
+      app.client.request("sessions.patch", params).then(function () {
+        showToast("已创建：" + label, "success");
+        console.log("[myclaw-newsession] 创建并命名成功:", newKey, label);
+      }).catch(function (err) {
+        showToast("改名失败：" + (err && err.message ? err.message : err), "error");
+        console.error("[myclaw-newsession] sessions.patch 失败:", err);
+      });
+    });
+  }
+
+  function createNewSessionButton() {
+    if (document.querySelector("#myclaw-newsession-btn")) return;
+
+    var btn = document.createElement("div");
+    btn.id = "myclaw-newsession-btn";
+    btn.style.cssText = [
+      "position: fixed",
+      "bottom: 8px",
+      "right: 335px",
+      "padding: 3px 10px",
+      "background: rgba(139, 92, 246, 0.85)",
+      "color: #fff",
+      "font-size: 11px",
+      "font-weight: bold",
+      "font-family: monospace",
+      "border-radius: 4px",
+      "z-index: 99999",
+      "user-select: none",
+      "cursor: pointer",
+      "transition: all 0.2s",
+      "letter-spacing: 0.5px",
+    ].join(";");
+    btn.textContent = "🆕 新会话";
+    btn.title = "创建新会话（可中文命名）";
+
+    btn.onmouseenter = function () { btn.style.background = "rgba(124, 58, 237, 1)"; btn.style.transform = "scale(1.05)"; };
+    btn.onmouseleave = function () { btn.style.background = "rgba(139, 92, 246, 0.85)"; btn.style.transform = "scale(1)"; };
+    btn.onclick = function (e) {
+      e.stopPropagation();
+      if (newSessionOpen) { closeNewSessionModal(); } else { openNewSessionModal(); }
+    };
+
+    document.body.appendChild(btn);
+  }
+
+  function closeNewSessionModal() {
+    newSessionOpen = false;
+    var m = document.querySelector("#myclaw-newsession-modal");
+    if (m) m.remove();
+  }
+
+  function openNewSessionModal() {
+    if (document.querySelector("#myclaw-newsession-modal")) return;
+    newSessionOpen = true;
+
+    var overlay = document.createElement("div");
+    overlay.id = "myclaw-newsession-modal";
+    overlay.style.cssText = [
+      "position: fixed", "top: 0", "left: 0", "width: 100vw", "height: 100vh",
+      "background: rgba(0,0,0,0.4)", "z-index: 99998",
+      "display: flex", "align-items: center", "justify-content: center",
+      "animation: myclaw-fade-in 0.15s ease",
+    ].join(";");
+    overlay.onclick = function (e) { if (e.target === overlay) closeNewSessionModal(); };
+
+    var box = document.createElement("div");
+    box.style.cssText = "width:360px;background:#1e1e2e;border-radius:8px;overflow:hidden;box-shadow:0 8px 32px rgba(0,0,0,0.5);";
+
+    var header = document.createElement("div");
+    header.style.cssText = "display:flex;align-items:center;justify-content:space-between;padding:10px 14px;background:#2d2d3f;color:#cdd6f4;font-size:13px;font-family:monospace;user-select:none;";
+    header.innerHTML = "<span>🆕 新会话</span>";
+    var closeBtn = document.createElement("span");
+    closeBtn.textContent = "✕";
+    closeBtn.style.cssText = "cursor:pointer;padding:2px 6px;border-radius:3px;font-size:14px;transition:background 0.15s;";
+    closeBtn.onmouseenter = function () { closeBtn.style.background = "rgba(255,255,255,0.1)"; };
+    closeBtn.onmouseleave = function () { closeBtn.style.background = "none"; };
+    closeBtn.onclick = function () { closeNewSessionModal(); };
+    header.appendChild(closeBtn);
+
+    var body = document.createElement("div");
+    body.style.cssText = "padding:16px;display:flex;flex-direction:column;gap:10px;";
+
+    var desc = document.createElement("div");
+    desc.textContent = "给新会话起个名字（支持中文），点击后自动创建并切换";
+    desc.style.cssText = "font-size:11px;color:#888;font-family:monospace;";
+    body.appendChild(desc);
+
+    var input = document.createElement("input");
+    input.type = "text";
+    input.placeholder = "如：期末复习计划";
+    input.style.cssText = "padding:8px 10px;background:#252536;border:1px solid #3d3d5c;border-radius:4px;color:#cdd6f4;font-size:13px;font-family:monospace;outline:none;";
+    input.onfocus = function () { input.style.borderColor = "#8b5cf6"; };
+    input.onblur = function () { input.style.borderColor = "#3d3d5c"; };
+    body.appendChild(input);
+
+    var submitBtn = document.createElement("button");
+    submitBtn.textContent = "创建";
+    submitBtn.style.cssText = "padding:8px 16px;background:#8b5cf6;border:none;border-radius:4px;color:#fff;font-size:12px;font-family:monospace;cursor:pointer;transition:opacity 0.15s;";
+    submitBtn.onmouseenter = function () { submitBtn.style.opacity = "0.8"; };
+    submitBtn.onmouseleave = function () { submitBtn.style.opacity = "1"; };
+
+    function doSubmit() {
+      var val = input.value.trim();
+      if (!val) { input.style.borderColor = "#ff4444"; input.focus(); return; }
+      closeNewSessionModal();
+      createNamedSession(val);
+    }
+    submitBtn.onclick = doSubmit;
+    input.onkeydown = function (e) { if (e.key === "Enter") doSubmit(); };
+    body.appendChild(submitBtn);
+
+    box.appendChild(header);
+    box.appendChild(body);
+    overlay.appendChild(box);
+    document.body.appendChild(overlay);
+    setTimeout(function () { input.focus(); }, 100);
+  }
+
   // ═══ 8. 右下角"命令"按钮 ═══
 
   var commandOpen = false;
@@ -1566,6 +1771,7 @@ btn.addEventListener("click", function () {
     createDocButton();
     createCmdButton();
     createCommandButton();
+    createNewSessionButton();
     injectStyles();
 
     // 初始化 VoiceInput SDK

package/package.json

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

package/patches/patch.js

@@ -113,6 +113,19 @@ function getMyclawVersion() {
   }
 }
 
+/**
+ * 获取已安装的 OpenClaw 版本号
+ * uiDir 形如 <pkg>/dist/control-ui，包根目录为 uiDir/../..
+ */
+function getOpenclawVersion(uiDir) {
+  try {
+    const pkgRoot = path.resolve(uiDir, '..', '..');
+    return require(path.join(pkgRoot, 'package.json')).version;
+  } catch {
+    return 'unknown';
+  }
+}
+
 /**
  * 执行注入
  */
@@ -250,6 +263,13 @@ function patch() {
     let patched = false;
     let foundTarget = false;
 
+    // img-src / media-src 放宽仅针对特定 OpenClaw 版本（2026.6.9）。
+    // 该版本 CSP 中 img-src/media-src 为 'self' data: blob:，会拦截 CDN 图片/视频；
+    // 限定版本可避免误改其它版本（CSP 结构可能不同，盲目放宽有风险）。
+    const ocVersion = getOpenclawVersion(uiDir);
+    const needsMediaCspFix = ocVersion === '2026.6.9';
+    console.log('[myclaw-patch] → OpenClaw 版本: ' + ocVersion + (needsMediaCspFix ? ' (将额外放宽 img-src/media-src)' : ''));
+
     for (const f of distFiles) {
       // 兼容多版本：gateway-cli-*.js（旧）、server-*.js（中）、control-ui-*.js（新）
       const isTarget = (f.startsWith('gateway-cli-') || f.startsWith('server-') || f.startsWith('control-ui-')) && f.endsWith('.js');
@@ -264,7 +284,9 @@ function patch() {
       const needsFrameSrc = !content.includes('"frame-src *');
       const needsConnectSrc = !content.includes("connect-src *");
       const needsFrameAncestors = !content.includes("frame-ancestors *");
-      const needsAnyCspPatch = needsFrameSrc || needsConnectSrc || needsFrameAncestors;
+      const needsImgSrc = needsMediaCspFix && !content.includes('"img-src *');
+      const needsMediaSrc = needsMediaCspFix && !content.includes('"media-src *');
+      const needsAnyCspPatch = needsFrameSrc || needsConnectSrc || needsFrameAncestors || needsImgSrc || needsMediaSrc;
 
       if (needsMicrophonePatch || needsAnyCspPatch) {
         // 备份
@@ -306,6 +328,16 @@ function patch() {
           content = content.replace(/\"frame-ancestors[^"]*\"/g, '"frame-ancestors *"');
           cspPatches.push('frame-ancestors *');
         }
+        // img-src → 允许所有（仅 2026.6.9，放行 CDN 图片）
+        if (needsImgSrc) {
+          content = content.replace(/\"img-src[^"]*\"/g, '"img-src *"');
+          cspPatches.push('img-src *');
+        }
+        // media-src → 允许所有（仅 2026.6.9，放行 CDN 视频）
+        if (needsMediaSrc) {
+          content = content.replace(/\"media-src[^"]*\"/g, '"media-src *"');
+          cspPatches.push('media-src *');
+        }
         if (cspPatches.length > 0) {
           console.log('[myclaw-patch] ✅ 已修复 CSP (' + cspPatches.join(', ') + '): ' + f);
         }