@aiyiran/myclaw 1.0.242 → 1.0.244

package/assets/myclaw-artifacts.js

@@ -30,6 +30,10 @@
   var panelVisible = false;
   var cachedData = null;
   var pollTimer = null;
+  var cachedConfig = null;  // { claw, base_url }
+  var envInfo = null;       // { remote: bool, clawName: string|null }
+  var MYCLAW_API_PORT = 18800;
+  var MYCLAW_API_BASE = 'http://127.0.0.1:' + MYCLAW_API_PORT;
 
   // ═══ 工具：从 URL 解析 agent 名称 ═══
   function getAgentName() {
@@ -47,18 +51,82 @@
     return '';
   }
 
-  // ═══ 构建预览 URL（CDN） ═══
-  function buildPreviewUrl(data, assetPath) {
-    var claw = window.location.hostname.split('.')[0];
-    if (!claw.includes('claw')) {
-      claw = localStorage.getItem(CLAW_STORAGE_KEY);
+  // ═══ 环境检测 ═══
+  // 判断当前是远程服务器还是本地环境
+  //   远程：https://claw.yiranlaoshi.com     → { remote: true,  clawName: 'clawdev' }
+  //   远程：https://claw3.kekouen.cn         → { remote: true,  clawName: 'claw3' }
+  //   本地：http://127.0.0.1:18789           → { remote: false, clawName: null }
+  function detectEnvironment() {
+    var hostname = window.location.hostname;
+
+    // claw.yiranlaoshi.com → 特殊映射：clawdev
+    if (hostname === 'claw.yiranlaoshi.com') {
+      return { remote: true, clawName: 'clawdev' };
+    }
+
+    // *.kekouen.cn → 子域名即 clawName
+    if (hostname.endsWith('.kekouen.cn')) {
+      var clawName = hostname.split('.')[0];
+      return { remote: true, clawName: clawName };
     }
-    if (!claw) {
-      console.error('[myclaw-artifacts] ❌ 未配置 claw 名称，无法构建预览链接');
+
+    // 本地或无法判定
+    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);
+    }
+
+    // 本地：从 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;
+      })
+      .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;
+      });
+  }
+
+  // ═══ 构建预览 URL ═══
+  // 统一走 CDN，clawName 和 workspaceName 由 cachedConfig 提供
+  function buildPreviewUrl(data, assetPath) {
+    var clawName = cachedConfig ? cachedConfig.claw : null;
+    var wsPrefix = cachedConfig ? cachedConfig.workspaceName : null;
+    if (!clawName || !wsPrefix) {
+      console.error('[myclaw-artifacts] ❌ 配置未就绪，无法构建预览链接');
       return null;
     }
-    var wsName = data.workspace_id || 'main';
-    return 'https://cdn.yiranlaoshi.com/' + claw + '/' + wsName + '/' + assetPath;
+    return 'https://cdn.yiranlaoshi.com/' + clawName + '/' + wsPrefix + '/' + assetPath;
   }
 
   // ═══ 创建按钮 ═══
@@ -197,20 +265,45 @@
   }
 
   // ═══ 请求数据 ═══
-  function getArtifactsUrl() {
-    var agentName = getAgentName() || 'main';
-    var wsPrefix = agentName === 'main' ? 'workspace' : 'workspace-' + agentName;
-    return window.location.origin + '/cmd/api/preview?path=' + wsPrefix + '/.myclaw/__MY_ARTIFACTS__.json';
+  function getWorkspaceId() {
+    return cachedConfig ? cachedConfig.workspaceName : 'workspace';
   }
 
-  function fetchArtifacts(contentEl) {
-    var url = getArtifactsUrl();
-    if (!url) return;
-    fetch(url)
+  function fetchArtifactsFromLocalAPI(wsPrefix) {
+    return fetch(MYCLAW_API_BASE + '/api/artifacts?workspace=' + encodeURIComponent(wsPrefix))
       .then(function (res) {
         if (!res.ok) throw new Error('HTTP ' + res.status);
         return res.json();
-      })
+      });
+  }
+
+  function fetchArtifactsFromCDN(wsPrefix) {
+    var clawName = cachedConfig ? cachedConfig.claw : null;
+    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 fetchArtifacts(contentEl) {
+    var wsPrefix = getWorkspaceId();
+    var fetcher;
+
+    if (envInfo && envInfo.remote) {
+      // 远程环境 → 走 CDN
+      fetcher = fetchArtifactsFromCDN(wsPrefix);
+    } else {
+      // 本地环境 → 优先本地 API，失败降级 CDN
+      fetcher = fetchArtifactsFromLocalAPI(wsPrefix)
+        .catch(function () { return fetchArtifactsFromCDN(wsPrefix); });
+    }
+
+    fetcher
       .then(function (data) {
         cachedData = data;
         if (!contentEl) return;
@@ -220,10 +313,9 @@
         }
         renderArtifactsList(contentEl, data);
       })
-      .catch(function (err) {
-        console.error('[myclaw-artifacts] 加载失败:', err);
+      .catch(function () {
         if (contentEl) {
-          contentEl.innerHTML = '<div style="text-align:center;padding:32px;color:#ff6b6b;">加载失败，请稍后重试</div>';
+          contentEl.innerHTML = '<div style="text-align:center;padding:32px;color:#888;">暂无作品</div>';
         }
       });
   }
@@ -618,15 +710,12 @@
         titleInput.style.borderColor = '#ff4444';
         return;
       }
-      var agentName = getAgentName() || 'main';
-      var wsField = agentName === 'main' ? 'workspace' : 'workspace-' + agentName;
-      var clawVal = window.location.hostname.split('.')[0];
       var payload = {
         title: titleVal,
-        workspace: wsField,
+        workspace: cachedConfig ? cachedConfig.workspaceName : 'workspace',
         cover_path: coverSelect.value || '',
         entry_path: entrySelect.value || '',
-        claw: clawVal,
+        claw: cachedConfig ? cachedConfig.claw : '',
       };
       submitBtn.disabled = true;
       submitBtn.textContent = '\u53D1\u5E03\u4E2D...';
@@ -834,9 +923,9 @@
       qrSection.style.cssText = 'display:flex;flex-direction:column;align-items:center;gap:6px;padding-top:4px;';
 
       var qrCanvas = document.createElement('canvas');
-      qrCanvas.style.cssText = 'width:140px;height:140px;border-radius:6px;background:#fff;padding:8px;';
+      qrCanvas.style.cssText = 'width:140px;height:140px;border-radius:6px;';
       try {
-        generateQR(qrCanvas, data.permanent_url, 140);
+        generateQR(qrCanvas, data.permanent_url, 280);
       } catch (e) {
         console.warn('[myclaw-artifacts] QR generate error:', e);
         qrCanvas.style.display = 'none';
@@ -858,11 +947,11 @@
     footer.style.cssText = 'padding: 0 24px 20px;text-align:center;display:flex;gap:10px;justify-content:center;';
 
     var showcaseBtn = document.createElement('a');
-    var agentName = getAgentName() || 'main';
-    var wsName = agentName === 'main' ? 'workspace' : 'workspace-' + agentName;
-    showcaseBtn.href = 'https://www.yiranlaoshi.com/showcase?workspace=' + wsName;
+    var cfgAgent = cachedConfig ? cachedConfig.agentName : 'main';
+    var cfgWs = cachedConfig ? cachedConfig.workspaceName : 'workspace';
+    showcaseBtn.href = 'https://www.yiranlaoshi.com/showcase?workspace=' + cfgWs;
     showcaseBtn.target = '_blank';
-    showcaseBtn.textContent = '\uD83D\uDC41 \u67E5\u770B' + agentName + '\u9879\u76EE\u96C6';
+    showcaseBtn.textContent = '\uD83D\uDC41 \u67E5\u770B' + cfgAgent + '\u9879\u76EE\u96C6';
     showcaseBtn.style.cssText = [
       'padding: 10px 20px',
       'background: #a78bfa',
@@ -1253,17 +1342,27 @@
     if (!qr) throw new Error("QR code too large");
 
     var moduleCount = qr.getModuleCount();
-    var cellSize = size / moduleCount;
+    // quiet zone: QR 规范要求至少 4 模块的留白
+    var quietZone = 4;
+    var totalModules = moduleCount + quietZone * 2;
+    var cellSize = size / totalModules;
     canvas.width = size;
     canvas.height = size;
     var ctx = canvas.getContext('2d');
+    // 白色背景（含 quiet zone）
     ctx.fillStyle = '#ffffff';
     ctx.fillRect(0, 0, size, size);
-    ctx.fillStyle = '#1e1e2e';
+    // 纯黑前景，确保扫码对比度
+    ctx.fillStyle = '#000000';
     for (var row = 0; row < moduleCount; row++) {
       for (var col = 0; col < moduleCount; col++) {
         if (qr.isDark(row, col)) {
-          ctx.fillRect(Math.floor(col * cellSize), Math.floor(row * cellSize), Math.ceil(cellSize), Math.ceil(cellSize));
+          ctx.fillRect(
+            Math.round((col + quietZone) * cellSize),
+            Math.round((row + quietZone) * cellSize),
+            Math.ceil(cellSize),
+            Math.ceil(cellSize)
+          );
         }
       }
     }
@@ -1300,8 +1399,11 @@
   function init() {
     injectStyles();
     createArtifactsButton();
-    startPolling();
-    console.log('[myclaw-artifacts] ✅ 初始化完成');
+    // 检测环境 → 获取配置 → 启动轮询
+    initConfig().then(function () {
+      startPolling();
+      console.log('[myclaw-artifacts] ✅ 初始化完成 (' + (envInfo.remote ? '远程: ' + envInfo.clawName : '本地') + ')');
+    });
   }
 
   if (document.readyState === 'loading') {

package/assets/myclaw-inject.js

@@ -522,6 +522,51 @@
   }
   // ═══ 6. 拦截发送按钮 ═══
 
+  var voiceEnterListening = false;
+  var voiceEnterTimeout = null;
+
+  /**
+   * 拦截 Enter 键：语音态下按回车 → 显示"等待中..."，2秒后自动发送
+   */
+  function hookVoiceEnter() {
+    if (voiceEnterListening) return;
+    voiceEnterListening = true;
+
+    document.addEventListener("keydown", function (e) {
+      // 只拦截 textarea 上的 Enter
+      if (e.key !== "Enter") return;
+      var ta = e.target.closest ? e.target.closest(".agent-chat__input textarea") : null;
+      if (!ta) return;
+      if (!recording) return;
+
+      // 阻止默认行为（不在 textarea 里插入换行）
+      e.preventDefault();
+      e.stopPropagation();
+
+      // 1) 显示"等待中..."
+      setTextareaValue("\u5F85\u6B3A\u4E2D...");
+      // 把光标移到末尾
+      try {
+        ta.setSelectionRange(ta.value.length, ta.value.length);
+      } catch (err) {}
+
+      // 2) 停止录音
+      stopVoice();
+
+      // 3) 2秒后自动点击发送按钮
+      if (voiceEnterTimeout) clearTimeout(voiceEnterTimeout);
+      voiceEnterTimeout = setTimeout(function () {
+        voiceEnterTimeout = null;
+        var sendBtn = document.querySelector("button.chat-send-btn, button[title=\"Send\"]");
+        if (sendBtn) {
+          sendBtn.click();
+        }
+        console.log("[myclaw-voice] Enter\u89E6\u53D1\u81EA\u52A8\u53D1\u9001");
+      }, 2000);
+
+    }, true); // 捕获阶段，确保早于原生处理
+  }
+
   var sendHooked = false;
 
   function hookSendButton() {
@@ -853,7 +898,7 @@
       { label: "\uD83D\uDCAC \u6DFB\u52A0\u5BF9\u8BDD", desc: "\u6253\u5F00\u5DF2\u6709\u4F19\u4F34\u7684\u5BF9\u8BDD\u7A97\u53E3", hasInput: true, inputTitle: "\u6DFB\u52A0\u5BF9\u8BDD", placeholder: "\u8F93\u5165\u4F19\u4F34\u540D\u79F0\uFF0C\u5982 kakaxi", hint: "\u8F93\u5165\u4F60\u7684\u4F19\u4F34\u7684\u540D\u79F0\uFF08\u82F1\u6587\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u8FDE\u5B57\u7B26\uFF09\uFF0C\u70B9\u51FB\u540E\u4F1A\u6253\u5F00\u5BF9\u8BDD\u7A97\u53E3", cmd: "mc tui {name}", color: "#10b981" },
       { label: "\uD83D\uDE80 \u5347\u7EA7", desc: "\u5347\u7EA7 myclaw \u5230\u6700\u65B0\u7248\u672C", hasInput: false, cmd: "mc up", color: "#8b5cf6" },
       { label: "\uD83D\uDD04 \u91CD\u542F", desc: "\u91CD\u542F\u670D\u52A1\uFF0C\u4FEE\u590D\u5927\u591A\u6570\u95EE\u9898", hasInput: false, cmd: "mc restart", color: "#ef4444" },
-      { label: "\uD83E\uDD1D \u65B0\u4F19\u4F34", desc: "\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684 AI \u4F19\u4F34", hasInput: true, inputTitle: "\u65B0\u5EFA\u4F19\u4F34", placeholder: "\u8F93\u5165\u65B0\u4F19\u4F34\u540D\u79F0\uFF0C\u5982 my-cat", hint: "\u7ED9\u4F60\u7684\u65B0 AI \u4F19\u4F34\u8D77\u4E2A\u540D\u5B57\uFF08\u82F1\u6587\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u8FDE\u5B57\u7B26\uFF09\uFF0C\u70B9\u51FB\u540E\u4F1A\u81EA\u52A8\u521B\u5EFA", cmd: "mc tui {name}", color: "#3b82f6" },
+      { label: "\uD83E\uDD1D \u65B0\u4F19\u4F34", desc: "\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684 AI \u4F19\u4F34", hasInput: true, inputTitle: "\u65B0\u5EFA\u4F19\u4F34", placeholder: "\u8F93\u5165\u65B0\u4F19\u4F34\u540D\u79F0\uFF0C\u5982 my-cat", hint: "\u7ED9\u4F60\u7684\u65B0 AI \u4F19\u4F34\u8D77\u4E2A\u540D\u5B57\uFF08\u82F1\u6587\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u8FDE\u5B57\u7B26\uFF09\uFF0C\u70B9\u51FB\u540E\u4F1A\u81EA\u52A8\u521B\u5EFA", cmd: "mc new {name}", color: "#3b82f6" },
     ];
 
     btns.forEach(function (item) {
@@ -908,6 +953,175 @@
       form.appendChild(row);
     });
 
+    // ── 删除伙伴按钮 ──
+    var delRow = document.createElement("div");
+    delRow.style.cssText = [
+      "padding:10px 14px",
+      "background:#252536",
+      "border-radius:6px",
+      "cursor:pointer",
+      "transition:background 0.15s",
+      "display:flex",
+      "align-items:center",
+      "gap:10px",
+    ].join(";");
+    delRow.onmouseenter = function () { delRow.style.background = "#2f2f4a"; };
+    delRow.onmouseleave = function () { delRow.style.background = "#252536"; };
+
+    var delBar = document.createElement("div");
+    delBar.style.cssText = "width:3px;height:28px;border-radius:2px;background:#ef4444;flex-shrink:0;";
+    delRow.appendChild(delBar);
+
+    var delInfo = document.createElement("div");
+    delInfo.style.cssText = "flex:1;display:flex;flex-direction:column;gap:2px;";
+    var delName = document.createElement("div");
+    delName.textContent = "\uD83D\uDDD1 \u5220\u9664\u4F19\u4F34";
+    delName.style.cssText = "font-size:13px;font-weight:bold;color:#ef4444;";
+    delInfo.appendChild(delName);
+    var delDesc = document.createElement("div");
+    delDesc.textContent = "\u5220\u9664\u4E00\u4E2A AI \u4F19\u4F34\uFF0C\u6B64\u64CD\u4F5C\u65E0\u6CD5\u6062\u590D";
+    delDesc.style.cssText = "font-size:11px;color:#888;";
+    delInfo.appendChild(delDesc);
+    delRow.appendChild(delInfo);
+
+    var delArrow = document.createElement("div");
+    delArrow.textContent = "\u25B6";
+    delArrow.style.cssText = "color:#555;font-size:10px;";
+    delRow.appendChild(delArrow);
+
+    delRow.onclick = function () {
+      showDeleteConfirm();
+    };
+
+    form.appendChild(delRow);
+
+    // 删除伙伴 - 双重确认弹框
+    function showDeleteConfirm() {
+      var mask = document.createElement("div");
+      mask.style.cssText = [
+        "position:fixed",
+        "top:0;left:0;width:100vw;height:100vh",
+        "background:rgba(0,0,0,0.3)",
+        "z-index:999999",
+        "display:flex",
+        "align-items:center",
+        "justify-content:center",
+        "animation:myclaw-fade-in 0.15s ease",
+      ].join(";");
+
+      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)",
+      ].join(";");
+
+      // 标题
+      var h = document.createElement("div");
+      h.style.cssText = "padding:10px 14px;background:#ef4444;color:#fff;font-size:13px;display:flex;justify-content:space-between;align-items:center;";
+      h.innerHTML = '<span>\uD83D\uDDD1 \u5220\u9664\u4F19\u4F34</span>';
+      var x = document.createElement("span");
+      x.textContent = "\u2715";
+      x.style.cssText = "cursor:pointer;padding:2px 6px;border-radius:3px;";
+      x.onclick = function () { mask.remove(); };
+      h.appendChild(x);
+      box.appendChild(h);
+
+      // body
+      var body = document.createElement("div");
+      body.style.cssText = "padding:16px;display:flex;flex-direction:column;gap:12px;";
+
+      var hint1 = document.createElement("div");
+      hint1.textContent = "\u8BF7\u8F93\u5165\u8981\u5220\u9664\u7684\u4F19\u4F34 ID\uFF1A";
+      hint1.style.cssText = "font-size:12px;color:#888;";
+      body.appendChild(hint1);
+
+      var input1 = document.createElement("input");
+      input1.type = "text";
+      input1.placeholder = "\u4F19\u4F34 ID";
+      input1.style.cssText = "padding:8px 10px;background:#252536;border:1px solid #3d3d5c;border-radius:4px;color:#cdd6f4;font-size:13px;font-family:monospace;outline:none;";
+      body.appendChild(input1);
+
+      var warn = document.createElement("div");
+      warn.textContent = "\u26A0 \u6B64\u64CD\u4F5C\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u540E\u5C06\u6C38\u4E45\u5220\u9664\uFF01";
+      warn.style.cssText = "font-size:11px;color:#ef4444;padding:8px;background:rgba(239,68,68,0.1);border-radius:4px;";
+      body.appendChild(warn);
+
+      var confirmHint = document.createElement("div");
+      confirmHint.textContent = '\u8BF7\u8F93\u5165 "YES" \u786E\u8BA4\u5220\u9664\uFF1A';
+      confirmHint.style.cssText = "font-size:12px;color:#888;";
+      confirmHint.style.display = "none";
+      body.appendChild(confirmHint);
+
+      var input2 = document.createElement("input");
+      input2.type = "text";
+      input2.placeholder = "YES";
+      input2.style.cssText = "padding:8px 10px;background:#252536;border:1px solid #3d3d5c;border-radius:4px;color:#cdd6f4;font-size:13px;font-family:monospace;outline:none;";
+      input2.style.display = "none";
+      body.appendChild(input2);
+
+      var submitBtn = document.createElement("button");
+      submitBtn.textContent = "\u7EE7\u7EED";
+      submitBtn.style.cssText = "padding:8px 16px;background:#ef4444;border:none;border-radius:4px;color:#fff;font-size:12px;font-family:monospace;cursor:pointer;";
+      body.appendChild(submitBtn);
+
+      var cancelBtn = document.createElement("button");
+      cancelBtn.textContent = "\u53D6\u6D88";
+      cancelBtn.style.cssText = "padding:8px 16px;background:#3d3d5c;border:none;border-radius:4px;color:#cdd6f4;font-size:12px;font-family:monospace;cursor:pointer;";
+      body.appendChild(cancelBtn);
+
+      box.appendChild(body);
+      mask.appendChild(box);
+      document.body.appendChild(mask);
+
+      input1.focus();
+
+      var agentId = "";
+      submitBtn.onclick = function () {
+        if (!agentId) {
+          // 第一步：输入 agent ID
+          agentId = input1.value.trim();
+          if (!agentId) {
+            input1.style.borderColor = "#ef4444";
+            input1.focus();
+            return;
+          }
+          // 显示第二步确认
+          input1.style.display = "none";
+          hint1.style.display = "none";
+          confirmHint.style.display = "block";
+          input2.style.display = "block";
+          submitBtn.textContent = "\u786E\u8BA4\u5220\u9664";
+          input2.value = "";
+          input2.focus();
+        } else {
+          // 第二步：确认删除
+          var confirmVal = input2.value.trim();
+          if (confirmVal.toUpperCase() !== "YES") {
+            input2.style.borderColor = "#ef4444";
+            input2.focus();
+            return;
+          }
+          submitBtn.disabled = true;
+          submitBtn.textContent = "\u6267\u884C\u4E2D...";
+          runCommand("openclaw agents delete " + agentId + " --force");
+          setTimeout(function () {
+            mask.remove();
+          }, 1000);
+        }
+      };
+
+      cancelBtn.onclick = function () {
+        mask.remove();
+      };
+
+      input2.onkeydown = function (e) {
+        if (e.key === "Enter") submitBtn.click();
+      };
+    }
+
     box.appendChild(header);
     box.appendChild(form);
     overlay.appendChild(box);
@@ -939,6 +1153,9 @@
     // 初始化 VoiceInput SDK
     initVoice();
 
+    // 拦截语音态 Enter 键
+    hookVoiceEnter();
+
     // 持续监听 DOM 变化，确保按钮始终在
     new MutationObserver(function () {
       if (!document.querySelector("#myclaw-voice-btn")) {

package/index.js

@@ -1172,7 +1172,53 @@ function padRight(str, len) {
 // 交互式菜单（上下键选择）
 // ============================================================================
 
+// ============================================================================
+// 机器选择配置
+// ============================================================================
+const MACHINE_CONFIG = [
+  { name: 'kendy', claw: 'claw1', desc: 'kendy 的机器' },
+  { name: 'Ethan', claw: 'claw2', desc: 'Ethan 的机器' },
+  { name: 'HENRY', claw: 'claw3', desc: 'HENRY 的机器' },
+  { name: 'Mo靖宇', claw: 'claw4', desc: 'Mo靖宇 的机器' },
+  { name: '高兴', claw: 'claw5', desc: '高兴 的机器' },
+  { name: '伊伊', claw: 'claw6', desc: '伊伊 的机器' },
+  { name: '雨熙', claw: 'claw7', desc: '雨熙 的机器' },
+  { name: '绍博', claw: 'claw8', desc: '绍博 的机器' },
+];
+
+function showMachineMenu() {
+  console.log('');
+  console.log('  ' + colors.blue + '机器选择' + colors.nc);
+  console.log('----------------------------------------');
+  console.log('');
+  MACHINE_CONFIG.forEach((m, i) => {
+    console.log('  ' + colors.cyan + (i + 1) + '.' + colors.nc + ' ' + m.name + ' (' + colors.dim + m.claw + colors.nc + ')');
+    console.log('     ' + colors.dim + m.desc + colors.nc);
+    console.log('');
+  });
+  console.log('  ' + colors.cyan + '0.' + colors.nc + ' 返回');
+  console.log('');
+
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  rl.question('请选择机器 [0-' + MACHINE_CONFIG.length + ']: ', function (answer) {
+    rl.close();
+    const choice = parseInt(answer.trim());
+    if (choice === 0) return;
+    if (choice >= 1 && choice <= MACHINE_CONFIG.length) {
+      const selected = MACHINE_CONFIG[choice - 1];
+      console.log('');
+      console.log(colors.green + '  → 已选择: ' + selected.name + ' (' + selected.claw + ')' + colors.nc);
+      console.log('  ' + colors.dim + '→ 正在用 Chrome 打开...' + colors.nc);
+      const { execSync } = require('child_process');
+      execSync('open -a "Google Chrome" "https://' + selected.claw + '.kekouen.cn?token=aiyiran"', { stdio: 'ignore' });
+    } else {
+      console.log('[' + colors.red + '错误' + colors.nc + '] 无效选择');
+    }
+  });
+}
+
 const MENU_ITEMS = [
+  { key: 'machine', label: '💻机器', cmd: 'mc machine', desc: '选择不同的机器', action: showMachineMenu },
   { key: 'start', label: '🦞启动🦞', cmd: 'mc start', desc: '把你的 AI 助手叫醒，让它开始工作', action: () => { const start = require('./start'); start.run(); } },
   { key: 'restart', label: '重启', cmd: 'mc restart', desc: 'AI 助手卡住了？让它重新启动一下', action: runRestart },
   { key: 'new', label: '😊新伙伴', cmd: 'mc new', desc: '创建一个新的 AI 助手，给它取个名字', action: runNew },
@@ -1484,7 +1530,7 @@ function runSync(workspaceName) {
 }
 
 async function runServer(name) {
-  const { spawn } = require('child_process');
+  const { spawn, execSync: execSyncLocal } = require('child_process');
   const fs = require('fs');
 
   // 用户目录下的服务目录
@@ -1492,6 +1538,19 @@ async function runServer(name) {
   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 pidFile = path.join(os.homedir(), '.openclaw', '.myclaw-sync.pid');
+
+  // 0. 杀死旧的 sync_workspace 进程（通过 PID 文件）
+  if (fs.existsSync(pidFile)) {
+    try {
+      const oldPid = parseInt(fs.readFileSync(pidFile, 'utf-8').trim(), 10);
+      if (oldPid && !isNaN(oldPid)) {
+        try { process.kill(oldPid, 'SIGTERM'); } catch (e) { /* 不存在则忽略 */ }
+        console.log('[Server] 已终止旧进程 PID=' + oldPid);
+      }
+    } catch (e) { /* 读取失败忽略 */ }
+    try { fs.unlinkSync(pidFile); } catch (e) { }
+  }
 
   // 1. 创建目标目录
   if (!fs.existsSync(targetDir)) {
@@ -1499,7 +1558,7 @@ async function runServer(name) {
     console.log('[Server] 创建目录: ' + targetDir);
   }
 
-  // 2. 覆盖 py 文件
+  // 2. 覆盖 py 文件（确保最新）
   fs.copyFileSync(sourcePyPath, targetPyPath);
   console.log('[Server] 同步脚本: ' + targetPyPath);
 
@@ -1550,14 +1609,25 @@ async function runServer(name) {
       console.error('[' + colors.red + '错误' + colors.nc + '] 启动失败: ' + err.message);
     });
 
-    child.on('exit', (code) => {
+    child.on('exit', (code, signal) => {
+      // 被 SIGTERM 杀死（下一次 mc server 启动时）→ 不重启
+      if (signal === 'SIGTERM') {
+        console.log('[Server] 服务已被外部终止，不再重启');
+        process.exit(0);
+        return;
+      }
       if (code !== null && code !== 0) {
         console.log('[' + colors.yellow + '警告' + colors.nc + '] 服务异常退出，代码: ' + code + '，3秒后重启...');
+        setTimeout(startProcess, 3000);
       } else {
-        console.log('[Server] 服务已停止');
+        console.log('[Server] 服务已正常停止');
       }
-      setTimeout(startProcess, 3000);
     });
+
+    // 记录子进程 PID 到文件
+    if (child.pid) {
+      fs.writeFileSync(pidFile, String(child.pid), 'utf-8');
+    }
   }
 
   startProcess();

package/package.json

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