@aiyiran/myclaw 1.1.68 → 1.1.70

package/assets/myclaw-artifacts.js

@@ -275,7 +275,7 @@
     var _scEnv = detectEnvironment();
     var _scClaw = _scEnv.remote ? _scEnv.clawName : (lastKnownClawName || '');
     var _scWs = getWorkspaceId();
-    showcaseLink.href = 'https://www.yiranlaoshi.com/showcase?claw=' + _scClaw + '&workspace=' + _scWs;
+    showcaseLink.href = 'https://www.yiranlaoshi.com/showcase?claw=' + _scClaw + '&workspace=' + _scWs + '&clawName=' + _scClaw;
     showcaseLink.target = '_blank';
     showcaseLink.textContent = '我的项目';
     showcaseLink.style.cssText = 'cursor:pointer;padding:2px 10px;border-radius:3px;font-size:12px;background:rgba(255,255,255,0.08);transition:background 0.15s;color:#cdd6f4;text-decoration:none;';
@@ -2157,54 +2157,21 @@
     forkForm.appendChild(urlInput);
     forkForm.appendChild(errMsg);
 
-    // 确认按钮
-    var forkSubmitBtn = document.createElement('button');
-    forkSubmitBtn.textContent = '\u786E\u8BA4\u83B7\u53D6';
-    forkSubmitBtn.style.cssText = [
-      'margin: 0 20px 20px',
-      'padding: 10px',
-      'background: #4a4a7a',
-      'border: none',
-      'border-radius: 4px',
-      'color: #cdd6f4',
-      'font-size: 13px',
-      'font-family: monospace',
-      'cursor: pointer',
-      'transition: background 0.15s',
-    ].join(';');
-    forkSubmitBtn.onmouseenter = function () { if (!forkSubmitBtn.disabled) forkSubmitBtn.style.background = '#5a5a9a'; };
-    forkSubmitBtn.onmouseleave = function () { if (!forkSubmitBtn.disabled) forkSubmitBtn.style.background = '#4a4a7a'; };
-
-    forkSubmitBtn.onclick = function () {
-      var url = urlInput.value.trim();
-
-      // 校验 URL 完整性
-      var valid = false;
-      try {
-        var parsed = new URL(url);
-        valid = parsed.protocol === 'http:' || parsed.protocol === 'https:';
-      } catch (e) { valid = false; }
-
-      if (!valid) {
-        urlInput.style.borderColor = '#ff4444';
-        errMsg.style.display = 'block';
-        errVisible = true;
-        return;
-      }
-      urlInput.style.borderColor = '#3d3d5c';
-      errMsg.style.display = 'none';
-      errVisible = false;
-
-      forkSubmitBtn.disabled = true;
-      forkSubmitBtn.textContent = '\u23F3 \u83B7\u53D6\u4E2D...';
-      forkSubmitBtn.style.background = '#3a3a5a';
-      forkSubmitBtn.style.cursor = 'default';
+    // 提交逻辑（供两个按钮共用）
+    function doFork(url, targetAgent, btn) {
+      btn.disabled = true;
+      btn.textContent = '⏳ 获取中...';
+      btn.style.background = '#3a3a5a';
+      btn.style.cursor = 'default';
       urlInput.disabled = true;
 
+      var body = { url: url };
+      if (targetAgent) body.targetAgent = targetAgent;
+
       fetch(MYCLAW_API_BASE + '/api/fork', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ url: url }),
+        body: JSON.stringify(body),
       })
         .then(function (res) {
           if (!res.ok) throw new Error('HTTP ' + res.status);
@@ -2212,7 +2179,6 @@
         })
         .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))
@@ -2221,8 +2187,8 @@
                 if (job.status === 'running') return;
                 clearInterval(timer);
                 if (job.status === 'done') {
-                  forkSubmitBtn.textContent = '\u2705 \u83B7\u53D6\u6210\u529F\uFF01';
-                  forkSubmitBtn.style.background = '#10b981';
+                  btn.textContent = '✅ 获取成功！';
+                  btn.style.background = '#10b981';
                   setTimeout(function () {
                     closeForkModal();
                     showForkDoneToast(job.workspace, job.files);
@@ -2233,18 +2199,90 @@
               })
               .catch(function (err) {
                 clearInterval(timer);
-                onForkError(err, forkSubmitBtn, urlInput);
+                onForkError(err, btn, urlInput);
               });
           }, 1500);
         })
         .catch(function (err) {
-          onForkError(err, forkSubmitBtn, urlInput);
+          onForkError(err, btn, urlInput);
         });
+    }
+
+    function validateAndFork(targetAgent, btn) {
+      var url = urlInput.value.trim();
+      var valid = false;
+      try {
+        var parsed = new URL(url);
+        valid = parsed.protocol === 'http:' || parsed.protocol === 'https:';
+      } catch (e) { valid = false; }
+
+      if (!valid) {
+        urlInput.style.borderColor = '#ff4444';
+        errMsg.style.display = 'block';
+        errVisible = true;
+        return;
+      }
+      urlInput.style.borderColor = '#3d3d5c';
+      errMsg.style.display = 'none';
+      errVisible = false;
+      doFork(url, targetAgent, btn);
+    }
+
+    // 按钮行
+    var btnRow = document.createElement('div');
+    btnRow.style.cssText = 'display:flex;gap:10px;margin:0 20px 20px;';
+
+    // 左侧主按钮：确认获取（新建空间）
+    var forkSubmitBtn = document.createElement('button');
+    forkSubmitBtn.textContent = '确认获取';
+    forkSubmitBtn.style.cssText = [
+      'flex: 2',
+      'padding: 10px',
+      'background: #4a4a7a',
+      'border: none',
+      'border-radius: 4px',
+      'color: #cdd6f4',
+      'font-size: 13px',
+      'font-family: monospace',
+      'cursor: pointer',
+      'transition: background 0.15s',
+    ].join(';');
+    forkSubmitBtn.onmouseenter = function () { if (!forkSubmitBtn.disabled) forkSubmitBtn.style.background = '#5a5a9a'; };
+    forkSubmitBtn.onmouseleave = function () { if (!forkSubmitBtn.disabled) forkSubmitBtn.style.background = '#4a4a7a'; };
+    forkSubmitBtn.onclick = function () { validateAndFork(null, forkSubmitBtn); };
+
+    // 右侧次按钮：获取到当前空间
+    var forkCurrentBtn = document.createElement('button');
+    forkCurrentBtn.textContent = '获取到当前空间';
+    forkCurrentBtn.style.cssText = [
+      'flex: 1',
+      'padding: 10px',
+      'background: #2d2d4a',
+      'border: 1px solid #4a4a7a',
+      'border-radius: 4px',
+      'color: #aaa',
+      'font-size: 12px',
+      'font-family: monospace',
+      'cursor: pointer',
+      'transition: background 0.15s',
+    ].join(';');
+    forkCurrentBtn.onmouseenter = function () { if (!forkCurrentBtn.disabled) forkCurrentBtn.style.background = '#3a3a5a'; };
+    forkCurrentBtn.onmouseleave = function () { if (!forkCurrentBtn.disabled) forkCurrentBtn.style.background = '#2d2d4a'; };
+    forkCurrentBtn.onclick = function () {
+      var currentAgent = getAgentName();
+      if (!currentAgent) {
+        alert('当前页面未检测到 agent，请确认 URL 中包含 session 或 agent 参数');
+        return;
+      }
+      validateAndFork(currentAgent, forkCurrentBtn);
     };
 
+    btnRow.appendChild(forkSubmitBtn);
+    btnRow.appendChild(forkCurrentBtn);
+
     box.appendChild(forkHeader);
     box.appendChild(forkForm);
-    box.appendChild(forkSubmitBtn);
+    box.appendChild(btnRow);
     overlay.appendChild(box);
     document.body.appendChild(overlay);
     urlInput.focus();

package/gateway.js

@@ -74,10 +74,12 @@ function stop() {
   }
 
   // 2b. 杀所有 openclaw 相关进程（防止僵尸进程）
+  // 注意：用精确匹配，避免误杀路径中含 "openclaw" 的无关进程（如 Antigravity 等）
   try {
     if (!isWin) {
       const myPid = process.pid;
-      const procs = execSync('pgrep -f "openclaw" 2>/dev/null || true', {
+      // pgrep -x 只匹配进程名本身；pgrep -f 的精确模式匹配 "openclaw gateway" 子命令
+      const procs = execSync('{ pgrep -x openclaw; pgrep -f "openclaw gateway"; } 2>/dev/null | sort -u || true', {
         encoding: 'utf8', stdio: 'pipe', timeout: 5000
       }).trim();
       if (procs) {

package/package.json

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

package/server/sync_workspace.py

@@ -624,40 +624,57 @@ def _download_from_cdn(key, local_path):
         return False
 
 
-def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=None):
-    """在后台线程中执行 fork"""
+def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=None, target_agent=None, claw_name=None):
+    """在后台线程中执行 fork
+    - target_agent 为 None 或对应目录不存在：新建 workspace
+    - target_agent 存在：将文件下载到该 workspace 下的子文件夹
+    - claw_name 指定目标 claw，由调用方负责路由；未传则使用本机默认路径
+    """
     try:
         now = datetime.now()
         time_id = now.strftime('%d') + 'D' + now.strftime('%M') + 'M'
 
-        # create_agent.js 会自动加 "workspace-" 前缀，所以这里只传去掉前缀的名字
-        # 例：src_workspace="workspace-fangshunhe" → agent_name="fangshunhe-v1-fork-15D30M"
-        #     mc new 创建目录 → workspace-fangshunhe-v1-fork-15D30M  ✓
         base_name = src_workspace
         if base_name.startswith("workspace-"):
             base_name = base_name[len("workspace-"):]
-        agent_name = f"{base_name}-v{src_version}-fork-{time_id}"
-        new_workspace = f"workspace-{agent_name}"
+        folder_name = f"{base_name}-v{src_version}-fork-{time_id}"
 
-        print(f"[Fork] 开始: {src_workspace} v{src_version} → {new_workspace}")
-        if entry_rel_path:
-            print(f"[Fork] 入口文件: {entry_rel_path}")
+        base_path = get_openclaw_path()
 
-        # mc new 创建 workspace（不带首条消息，等文件下载完再发）
-        mc_result = subprocess.run(
-            ["mc", "new", agent_name],
-            capture_output=True, text=True
-        )
-        if mc_result.returncode != 0:
-            _fork_jobs[job_id] = {
-                "status": "failed",
-                "error": f"mc new 失败: {mc_result.stderr.strip()}"
-            }
-            return
+        # 判断是否使用已有 workspace
+        use_existing = False
+        if target_agent:
+            target_workspace = f"workspace-{target_agent}" if not target_agent.startswith("workspace-") else target_agent
+            target_workspace_dir = os.path.join(base_path, target_workspace)
+            if os.path.isdir(target_workspace_dir):
+                use_existing = True
+
+        if use_existing:
+            # 下载到已有 workspace 的子文件夹中
+            agent_name = target_agent if not target_agent.startswith("workspace-") else target_agent[len("workspace-"):]
+            workspace_name = target_workspace
+            target_dir = os.path.join(target_workspace_dir, folder_name)
+            print(f"[Fork] 使用已有空间: {workspace_name}, 子文件夹: {folder_name}")
+        else:
+            # 新建 workspace
+            agent_name = folder_name
+            workspace_name = f"workspace-{agent_name}"
+            target_dir = os.path.join(base_path, workspace_name)
+            print(f"[Fork] 新建空间: {workspace_name}")
+
+            mc_result = subprocess.run(
+                ["mc", "new", agent_name],
+                capture_output=True, text=True
+            )
+            if mc_result.returncode != 0:
+                _fork_jobs[job_id] = {
+                    "status": "failed",
+                    "error": f"mc new 失败: {mc_result.stderr.strip()}"
+                }
+                return
 
-        base_path = get_openclaw_path()
-        # create_agent.js: workspaceDir = openclawDir + "/workspace-" + agentId
-        target_dir = os.path.join(base_path, new_workspace)
+        if entry_rel_path:
+            print(f"[Fork] 入口文件: {entry_rel_path}")
 
         # 列出源文件
         prefix = f"{FORK_CDN_PREFIX}/{src_clawname}/{src_workspace}/{src_version}/"
@@ -676,24 +693,26 @@ def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=No
             rel_path = unquote(key[len(prefix):])
             if not rel_path:
                 continue
+            # 已有空间模式：rel_path 前加子文件夹前缀
+            record_rel = os.path.join(folder_name, rel_path) if use_existing else rel_path
             local_path = os.path.join(target_dir, rel_path)
             if _download_from_cdn(key, local_path):
                 success += 1
-                downloaded_rels.append(rel_path)
-                print(f"  ✓ {rel_path}")
+                downloaded_rels.append(record_rel)
+                print(f"  ✓ {record_rel}")
 
         print(f"[Fork] 完成: 成功 {success}/{len(files)} 个文件")
 
         # 写入 JSON 记录，入口文件最后写，确保其 updated_at 最新排第一
-        entry_decoded = unquote(entry_rel_path) if entry_rel_path else None
+        entry_decoded = os.path.join(folder_name, unquote(entry_rel_path)) if (use_existing and entry_rel_path) else (unquote(entry_rel_path) if entry_rel_path else None)
         for rel in downloaded_rels:
             if rel != entry_decoded:
-                init_config(new_workspace, rel, method="add")
+                init_config(workspace_name, rel, method="add")
         if entry_decoded and entry_decoded in downloaded_rels:
-            init_config(new_workspace, entry_decoded, method="add")
+            init_config(workspace_name, entry_decoded, method="add")
             print(f"[Fork] 入口文件已置顶: {entry_decoded}")
 
-        # 文件到位后再发分析消息，确保 AI 能读到 fork 的内容
+        # 文件到位后再发分析消息
         fork_message = (
             "你好！请你仔细阅读我 workspace 下的所有文件，"
             "简单介绍一下这个项目有哪些资源、大概是做什么用的，"
@@ -711,7 +730,8 @@ def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=No
 
         _fork_jobs[job_id] = {
             "status": "done",
-            "workspace": new_workspace,
+            "workspace": workspace_name,
+            "folder": folder_name if use_existing else None,
             "files": success,
             "total": len(files)
         }
@@ -721,10 +741,12 @@ def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=No
         _fork_jobs[job_id] = {"status": "failed", "error": str(e)}
 
 
-def start_fork(remote_url):
+def start_fork(remote_url, target_agent=None, claw_name=None):
     """
     解析 remote_url，生成 job_id，在后台线程执行 fork。
     URL 格式: https://cdn.yiranlaoshi.com/myclaw/show/{clawname}/{workspace}/{version}/...
+    target_agent: 可选，指定已有 workspace 的 agent 名（不含 workspace- 前缀亦可）
+    claw_name:    可选，指定目标 claw，由调用方负责路由到对应机器/目录
     """
     parsed = urlparse(remote_url)
     # path: /myclaw/show/{clawname}/{workspace}/{version}/...
@@ -747,7 +769,7 @@ def start_fork(remote_url):
 
     t = threading.Thread(
         target=_do_fork,
-        args=(job_id, src_clawname, src_workspace, src_version, entry_rel_path),
+        args=(job_id, src_clawname, src_workspace, src_version, entry_rel_path, target_agent, claw_name),
         daemon=True
     )
     t.start()
@@ -1030,11 +1052,13 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({"ok": False, "error": str(e)}, 500)
 
     def _handle_fork(self):
-        """POST /api/fork  Body: {"url": "https://cdn.yiranlaoshi.com/myclaw/show/..."}"""
+        """POST /api/fork  Body: {"url": "...", "targetAgent": "myspace"(可选), "clawName": "alice"(可选)}"""
         try:
             length = int(self.headers.get('Content-Length', 0))
             body = json.loads(self.rfile.read(length).decode('utf-8')) if length else {}
             remote_url = body.get('url', '')
+            target_agent = body.get('targetAgent', None) or None
+            claw_name = body.get('clawName', None) or None
         except Exception:
             self._send_json({"error": "请求体解析失败"}, 400)
             return
@@ -1043,7 +1067,7 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({"error": "缺少 url 参数"}, 400)
             return
 
-        job_id, err = start_fork(remote_url)
+        job_id, err = start_fork(remote_url, target_agent, claw_name)
         if err:
             self._send_json({"error": err}, 400)
             return