@aiyiran/myclaw 1.0.246 → 1.0.248

package/assets/myclaw-artifacts.js

@@ -30,8 +30,7 @@
   var panelVisible = false;
   var cachedData = null;
   var pollTimer = null;
-  var cachedConfig = null;  // { claw, base_url }
-  var envInfo = null;       // { remote: bool, clawName: string|null }
+  var lastKnownClawName = null; // 本地环境下从 API 获取，remote 环境每次从 hostname 实时派生
   var MYCLAW_API_PORT = 18800;
   var MYCLAW_API_BASE = 'http://127.0.0.1:' + MYCLAW_API_PORT;
 
@@ -74,56 +73,35 @@
     return { remote: false, clawName: null };
   }
 
-  // ═══ 初始化配置 ═══
-  // 远程环境直接用 hostname 中的 clawName
-  // 本地环境从 sync_workspace.py 的 HTTP API 获取
-  function initConfig() {
-    envInfo = detectEnvironment();
-
-    // 解析 agentName 和 workspaceName（与环境无关，纯粹从 URL 参数获取）
-    var agent = getAgentName() || 'main';
-    var workspace = agent === 'main' ? 'workspace' : 'workspace-' + agent;
-
-    if (envInfo.remote) {
-      // 远程：直接拿到 clawName，不需要请求
-      cachedConfig = {
-        claw: envInfo.clawName,
-        base_url: 'https://cdn.yiranlaoshi.com/' + envInfo.clawName,
-        agentName: agent,
-        workspaceName: workspace,
-      };
-      console.log('[myclaw-artifacts] ✅ 远程环境:', envInfo.clawName, '| agent:', agent, '| workspace:', workspace);
-      return Promise.resolve(cachedConfig);
+  // ═══ 获取 clawName（本地环境从 API 实时获取） ═══
+  function resolveClawName() {
+    var env = detectEnvironment();
+    if (env.remote) {
+      return Promise.resolve(env.clawName);
     }
-
-    // 本地：从 API 获取 claw 配置
     return fetch(MYCLAW_API_BASE + '/api/config')
       .then(function (res) {
         if (!res.ok) throw new Error('HTTP ' + res.status);
         return res.json();
       })
       .then(function (data) {
-        data.agentName = agent;
-        data.workspaceName = workspace;
-        cachedConfig = data;
-        console.log('[myclaw-artifacts] ✅ 本地环境 | claw:', data.claw, '| agent:', agent, '| workspace:', workspace);
-        return data;
+        lastKnownClawName = data.claw;
+        return data.claw;
       })
       .catch(function (err) {
-        // API 不可用时仍保留 agent/workspace 信息
-        cachedConfig = { claw: null, base_url: null, agentName: agent, workspaceName: workspace };
         console.warn('[myclaw-artifacts] ⚠ 本地 API 不可用:', err.message);
-        return cachedConfig;
+        return lastKnownClawName; // 降级用上次成功的值
       });
   }
 
   // ═══ 构建预览 URL ═══
-  // 统一走 CDN，clawName 和 workspaceName 由 cachedConfig 提供
+  // 统一走 CDN，clawName 实时派生，wsPrefix 实时从当前 URL 计算
   function buildPreviewUrl(data, assetPath) {
-    var clawName = cachedConfig ? cachedConfig.claw : null;
-    var wsPrefix = cachedConfig ? cachedConfig.workspaceName : null;
+    var env = detectEnvironment();
+    var clawName = env.remote ? env.clawName : lastKnownClawName;
+    var wsPrefix = getWorkspaceId();
     if (!clawName || !wsPrefix) {
-      console.error('[myclaw-artifacts] ❌ 配置未就绪，无法构建预览链接');
+      console.error('[myclaw-artifacts] ❌ clawName 未就绪，无法构建预览链接');
       return null;
     }
     return 'https://cdn.yiranlaoshi.com/' + clawName + '/' + wsPrefix + '/' + assetPath;
@@ -266,7 +244,8 @@
 
   // ═══ 请求数据 ═══
   function getWorkspaceId() {
-    return cachedConfig ? cachedConfig.workspaceName : 'workspace';
+    var agent = getAgentName() || 'main';
+    return agent === 'main' ? 'workspace' : 'workspace-' + agent;
   }
 
   function fetchArtifactsFromLocalAPI(wsPrefix) {
@@ -277,8 +256,7 @@
       });
   }
 
-  function fetchArtifactsFromCDN(wsPrefix) {
-    var clawName = cachedConfig ? cachedConfig.claw : null;
+  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) {
@@ -299,18 +277,18 @@
   }
 
   function fetchArtifacts(contentEl) {
-    // cachedConfig 未就绪时跳过，等 initConfig 完成后的 startPolling 重试
-    if (!cachedConfig) return;
-
+    var env = detectEnvironment();
     var wsPrefix = getWorkspaceId();
     var fetcher;
 
-    if (envInfo && envInfo.remote) {
-      // 远程服务器 → 走 /cmd/api（服务器直接提供 JSON）
+    if (env.remote) {
+      // 远程服务器 → 走 /cmd/api
       fetcher = fetchArtifactsFromServerAPI(wsPrefix);
     } else {
-      // 本地环境 → 走 CDN
-      fetcher = fetchArtifactsFromCDN(wsPrefix);
+      // 本地环境 → 实时拿 clawName → 走 CDN
+      fetcher = resolveClawName().then(function (clawName) {
+        return fetchArtifactsFromCDN(wsPrefix, clawName);
+      });
     }
 
     fetcher
@@ -722,10 +700,10 @@
       }
       var payload = {
         title: titleVal,
-        workspace: cachedConfig ? cachedConfig.workspaceName : 'workspace',
+        workspace: getWorkspaceId(),
         cover_path: coverSelect.value || '',
         entry_path: entrySelect.value || '',
-        claw: cachedConfig ? cachedConfig.claw : '',
+        claw: (function () { var e = detectEnvironment(); return e.remote ? e.clawName : (lastKnownClawName || ''); }()),
       };
       submitBtn.disabled = true;
       submitBtn.textContent = '\u53D1\u5E03\u4E2D...';
@@ -957,8 +935,8 @@
     footer.style.cssText = 'padding: 0 24px 20px;text-align:center;display:flex;gap:10px;justify-content:center;';
 
     var showcaseBtn = document.createElement('a');
-    var cfgAgent = cachedConfig ? cachedConfig.agentName : 'main';
-    var cfgWs = cachedConfig ? cachedConfig.workspaceName : 'workspace';
+    var cfgAgent = getAgentName() || 'main';
+    var cfgWs = getWorkspaceId();
     showcaseBtn.href = 'https://www.yiranlaoshi.com/showcase?workspace=' + cfgWs;
     showcaseBtn.target = '_blank';
     showcaseBtn.textContent = '\uD83D\uDC41 \u67E5\u770B' + cfgAgent + '\u9879\u76EE\u96C6';
@@ -1409,11 +1387,9 @@
   function init() {
     injectStyles();
     createArtifactsButton();
-    // 检测环境 → 获取配置 → 启动轮询
-    initConfig().then(function () {
-      startPolling();
-      console.log('[myclaw-artifacts] ✅ 初始化完成 (' + (envInfo.remote ? '远程: ' + envInfo.clawName : '本地') + ')');
-    });
+    startPolling();
+    var env = detectEnvironment();
+    console.log('[myclaw-artifacts] ✅ 初始化完成 (' + (env.remote ? '远程: ' + env.clawName : '本地') + ')');
   }
 
   if (document.readyState === 'loading') {

package/assets/myclaw-inject.js

@@ -341,10 +341,18 @@ btn.addEventListener("click", function () {
     if (!btn) return;
 
     if (recording) {
+      btn.classList.remove("myclaw-voice-stopping");
       btn.classList.add("agent-chat__input-btn--recording");
+      btn.disabled = false;
       btn.title = "\u505c\u6b62\u8bed\u97f3";
-    } else {
+    } else if (stopping) {
       btn.classList.remove("agent-chat__input-btn--recording");
+      btn.classList.add("myclaw-voice-stopping");
+      btn.disabled = true;
+      btn.title = "\u5904\u7406\u4e2d\u2026";
+    } else {
+      btn.classList.remove("agent-chat__input-btn--recording", "myclaw-voice-stopping");
+      btn.disabled = false;
       btn.title = "\u8baf\u98de\u8bed\u97f3";
     }
 
@@ -465,6 +473,7 @@ btn.addEventListener("click", function () {
     voiceStopTimer = setTimeout(function () {
       voiceStopTimer = null;
       stopping = false;
+      updateButtonUI();
       console.log("[myclaw-voice] 2s timer fired, closing resources...");
 
       // 快照当前 textarea 值（2 秒内 onResult 可能已更新）
@@ -529,6 +538,11 @@ btn.addEventListener("click", function () {
       "  animation: myclaw-ring 1.5s ease-out infinite;",
       "  pointer-events: none;",
       "}",
+      /* 按钮处理中态：灰色半透明，禁止点击 */
+      ".myclaw-voice-stopping {",
+      "  opacity: 0.4 !important;",
+      "  cursor: not-allowed !important;",
+      "}",
       /* textarea 录音态：左侧红色竖线 + 微弱红色背景 */
       ".myclaw-voice-active {",
       "  border-left: 3px solid #ff4444 !important;",

package/index.js

@@ -835,12 +835,17 @@ function runPatch() {
   console.log('');
   const skillResult = patchSkills();
 
-  // 3. 智能体上传（从 agent-list/ 复制到 ~/.openclaw/）
+  // 3. Python 依赖安装（读取 requirements.txt，pip install 缺失的包）
+  console.log('');
+  const { patchPythonDeps } = require('./patches/patch-python-deps');
+  patchPythonDeps();
+
+  // 4. 智能体上传（从 agent-list/ 复制到 ~/.openclaw/）
   console.log('');
   const { patchAgents } = require('./patches/patch-agent');
   const agentResult = patchAgents();
 
-  // 4. Config 补丁（从 manifest 读取，修改 openclaw.json）
+  // 5. Config 补丁（从 manifest 读取，修改 openclaw.json）
   console.log('');
   try {
     const { loadManifest } = require('./patches/patch-agent');
@@ -888,7 +893,7 @@ function runPatch() {
     console.log('[myclaw-config] ⚠ 配置补丁失败: ' + err.message);
   }
 
-  // 5. 自定义注入脚本执行引擎 (Manifest `run` 数组)
+  // 6. 自定义注入脚本执行引擎 (Manifest `run` 数组)
   // 此处读取 manifest.json 中的 "run" 数组，并按顺序 require 执行对应的模块。
   // 通过修改 manifest 即可控制额外脚本（如 inject-image, inject-search）是否跟随 patch 自动执行，
   // 从而避免硬编码具体要注入哪些模块。

package/package.json

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

package/patches/patch-python-deps.js

@@ -0,0 +1,79 @@
+/**
+ * ============================================================================
+ * MyClaw Patch Python Deps
+ * ============================================================================
+ *
+ * 功能：
+ *   读取 myclaw 根目录下的 requirements.txt，检查并安装所有 Python 依赖。
+ *   幂等：已安装的包跳过，只安装缺失的。
+ * ============================================================================
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function patchPythonDeps() {
+  const reqPath = path.join(__dirname, '..', 'requirements.txt');
+
+  if (!fs.existsSync(reqPath)) {
+    console.log('[myclaw-python-deps] ⚠ 未找到 requirements.txt，跳过');
+    return { success: true, installed: [] };
+  }
+
+  const packages = fs.readFileSync(reqPath, 'utf8')
+    .split('\n')
+    .map(l => l.trim())
+    .filter(l => l && !l.startsWith('#'));
+
+  if (packages.length === 0) {
+    console.log('[myclaw-python-deps] ✅ requirements.txt 为空，无需安装');
+    return { success: true, installed: [] };
+  }
+
+  console.log('[myclaw-python-deps] 检查 Python 依赖...');
+
+  const missing = [];
+
+  for (const pkg of packages) {
+    // pip 包名转 import 名：把连字符换成下划线（volcengine → volcengine，boto3 → boto3）
+    const importName = pkg.split(/[>=<!]/)[0].trim().replace(/-/g, '_');
+    try {
+      execSync(`python3 -c "import ${importName}"`, { stdio: 'pipe' });
+      console.log('[myclaw-python-deps] ✅ 已安装: ' + pkg);
+    } catch {
+      console.log('[myclaw-python-deps] ⚠ 缺少: ' + pkg);
+      missing.push(pkg);
+    }
+  }
+
+  if (missing.length === 0) {
+    console.log('[myclaw-python-deps] ✅ 所有依赖已就绪');
+    return { success: true, installed: [] };
+  }
+
+  console.log('[myclaw-python-deps] → 安装缺失依赖: ' + missing.join(', '));
+
+  const installed = [];
+  const failed = [];
+
+  for (const pkg of missing) {
+    try {
+      execSync(`pip3 install -q ${pkg}`, { stdio: 'pipe' });
+      console.log('[myclaw-python-deps] ✅ 已安装: ' + pkg);
+      installed.push(pkg);
+    } catch (err) {
+      console.log('[myclaw-python-deps] ❌ 安装失败: ' + pkg + ' — ' + err.message);
+      failed.push(pkg);
+    }
+  }
+
+  if (failed.length > 0) {
+    console.log('[myclaw-python-deps] ⚠ 以下依赖安装失败，请手动运行:');
+    console.log('    pip3 install ' + failed.join(' '));
+  }
+
+  return { success: failed.length === 0, installed, failed };
+}
+
+module.exports = { patchPythonDeps };

package/requirements.txt

@@ -0,0 +1,2 @@
+volcengine
+requests