@hupan56/wlkj 2.4.2 → 2.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hupan56/wlkj",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
   "bin": {
     "wlkj": "bin/cli.js"

package/templates/qoder/scripts/team_sync.py

@@ -193,6 +193,12 @@ def do_pull(quiet=False):
             print('Already up to date.')
         else:
             print('Pulled latest from team.')
+            # 拉到队友的新 PRD → 自动 collect 到 data/docs/prd/ (历史归档)
+            try:
+                from git_sync import collect_prds
+                collect_prds()
+            except Exception:
+                pass  # collect 失败不阻塞 pull
     return 0
 
 
@@ -382,6 +388,13 @@ def _do_push_locked(message, dev, skip_eval, skip_secret):
         if r.returncode == 0:
             touch_pull_marker()
             print('Synced to team. (attempt {})'.format(attempt))
+            # push 成功后, 自动 collect PRD 到 data/docs/prd/ (历史归档)
+            # 这样 search_index --prd 能立刻搜到新 PRD, 不用等周五 cron
+            try:
+                from git_sync import collect_prds
+                collect_prds()
+            except Exception as e:
+                print('[sync] PRD 归档跳过 (不阻塞): ' + str(e)[:80])
             # D2: 检测 PRD 发布并推飞书通知
             _notify_prd_publications(staged_files)
             return 0
@@ -393,22 +406,44 @@ def _do_push_locked(message, dev, skip_eval, skip_secret):
 
 
 def do_status():
+    # 性能优化: 合并 git 调用 (原 5 次 → 2 次)
+    # 一次 git status --branch --porcelain 拿到: 分支名 + ahead/behind + dirty 文件
+    r = git('status', '--branch', '--porcelain', '--', *SYNC_SCOPES)
     branch = current_branch()
     print('Branch: {}'.format(branch))
     print('Developer: {}'.format(get_developer() or 'NOT SET'))
 
     if not has_remote():
         print('Remote: none (local-only mode)')
+        # 仍显示 dirty 文件
+        dirty = [l for l in r.stdout.strip().splitlines() if l.strip() and not l.startswith('##')]
+        if dirty:
+            print('未同步的本地产出: {} 个文件'.format(len(dirty)))
+            for l in dirty[:10]:
+                print('  ' + l)
         return 0
 
-    git('fetch', 'origin', branch)
-    r = git('rev-list', '--left-right', '--count', 'origin/{}...HEAD'.format(branch))
-    if r.returncode == 0 and r.stdout.strip():
-        behind, ahead = r.stdout.split()
-        print('Ahead (待推送): {}, Behind (待拉取): {}'.format(ahead, behind))
-
-    r = git('status', '--short', '--', *SYNC_SCOPES)
-    dirty = [l for l in r.stdout.strip().splitlines() if l.strip()]
+    # 从 status --branch 输出解析 ahead/behind (避免单独 fetch+rev-list)
+    for line in r.stdout.splitlines():
+        if line.startswith('## ') and '...' in line:
+            # 格式: ## master...origin/master [ahead 3, behind 1]
+            import re as _re
+            ahead_m = _re.search(r'ahead (\d+)', line)
+            behind_m = _re.search(r'behind (\d+)', line)
+            ahead = ahead_m.group(1) if ahead_m else '0'
+            behind = behind_m.group(1) if behind_m else '0'
+            print('Ahead (待推送): {}, Behind (待拉取): {}'.format(ahead, behind))
+            break
+    else:
+        # 没解析到 ahead/behind (可能需要 fetch), 回退到 rev-list
+        r2 = git('rev-list', '--left-right', '--count', 'origin/{}...HEAD'.format(branch))
+        if r2.returncode == 0 and r2.stdout.strip():
+            parts = r2.stdout.split()
+            if len(parts) == 2:
+                behind, ahead = parts
+                print('Ahead (待推送): {}, Behind (待拉取): {}'.format(ahead, behind))
+
+    dirty = [l for l in r.stdout.strip().splitlines() if l.strip() and not l.startswith('##')]
     print('未同步的本地产出: {} 个文件'.format(len(dirty)))
     for l in dirty[:10]:
         print('  ' + l)