@aiyiran/myclaw 1.1.70 → 1.1.72

package/gateway.js

@@ -78,8 +78,8 @@ function stop() {
   try {
     if (!isWin) {
       const myPid = process.pid;
-      // pgrep -x 只匹配进程名本身；pgrep -f 的精确模式匹配 "openclaw gateway" 子命令
-      const procs = execSync('{ pgrep -x openclaw; pgrep -f "openclaw gateway"; } 2>/dev/null | sort -u || true', {
+      // 只匹配进程名完全等于 openclaw 的进程，避免误杀路径/命令行中含关键字的无关进程
+      const procs = execSync('pgrep -x openclaw 2>/dev/null || true', {
         encoding: 'utf8', stdio: 'pipe', timeout: 5000
       }).trim();
       if (procs) {

package/package.json

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

package/server/sync_workspace.py

@@ -591,16 +591,21 @@ def _list_files_from_qiniu(prefix):
     """按前缀列出七牛 OSS 上的所有文件"""
     marker = None
     files = []
+    print(f"[Qiniu] 列举前缀: bucket={bucket_name}, prefix={prefix}")
     while True:
         ret, eof, info = bucket_manager.list(
             bucket_name, prefix=prefix, marker=marker, limit=1000)
         if ret is not None:
-            files.extend(ret.get('items', []))
+            batch = ret.get('items', [])
+            files.extend(batch)
             marker = ret.get('marker')
+            print(f"[Qiniu] 本批 {len(batch)} 个文件, eof={eof}")
             if eof:
                 break
         else:
+            print(f"[Qiniu] ❌ list 失败: status={info.status_code}, error={info.text_body}")
             break
+    print(f"[Qiniu] 共找到 {len(files)} 个文件")
     return files
 
 
@@ -624,15 +629,14 @@ def _download_from_cdn(key, local_path):
         return False
 
 
-def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=None, target_agent=None, claw_name=None):
+def _do_fork(job_id, src_clawname, src_workspace, src_version, entry_rel_path=None, target_agent=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'
+        time_id = now.strftime('%d') + 'd' + now.strftime('%M') + 'm'
 
         base_name = src_workspace
         if base_name.startswith("workspace-"):
@@ -741,12 +745,11 @@ 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, target_agent=None, claw_name=None):
+def start_fork(remote_url, target_agent=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}/...
@@ -769,7 +772,7 @@ def start_fork(remote_url, target_agent=None, claw_name=None):
 
     t = threading.Thread(
         target=_do_fork,
-        args=(job_id, src_clawname, src_workspace, src_version, entry_rel_path, target_agent, claw_name),
+        args=(job_id, src_clawname, src_workspace, src_version, entry_rel_path, target_agent),
         daemon=True
     )
     t.start()
@@ -1058,7 +1061,6 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             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
@@ -1067,7 +1069,7 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({"error": "缺少 url 参数"}, 400)
             return
 
-        job_id, err = start_fork(remote_url, target_agent, claw_name)
+        job_id, err = start_fork(remote_url, target_agent)
         if err:
             self._send_json({"error": err}, 400)
             return