@hupan56/wlkj 2.4.5 → 2.4.7

package/templates/qoder/scripts/syncgate.py

@@ -275,6 +275,15 @@ def check_eval_gate(
         full = os.path.join(repo_root, prd) if not os.path.isabs(prd) else prd
         if not os.path.isfile(full):
             continue
+        # PRD-3: Quick 模式 PRD 跳过 A3 (字段引用检查)
+        # Mini-PRD 格式精简, A3 的表格字段检查不适用
+        try:
+            with open(full, 'r', encoding='utf-8', errors='replace') as f:
+                head = f.read(2048)
+            if 'mode: quick' in head.lower():
+                continue  # Quick 模式, 跳过 EVA
+        except OSError:
+            pass
         # 找同名原型 (可选)
         dirname = os.path.dirname(full)
         base = os.path.splitext(os.path.basename(full))[0]

package/templates/qoder/scripts/team_sync.py

@@ -145,10 +145,16 @@ def report_conflict(stderr):
     # autostash 风险检查: --autostash 可能在 abort 后留下未弹回的 stash
     stash_r = git('stash', 'list')
     if stash_r.returncode == 0 and stash_r.stdout.strip():
-        stash_count = len([l for l in stash_r.stdout.strip().split('\n') if l.strip()])
-        print('WARNING: 检测到 {} 个 stash (可能是 autostash 未弹回)!'.format(stash_count))
-        print('  查看 stash: git stash list')
-        print('  恢复改动: git stash pop  (如果包含你的草稿)')
+        stash_lines = [l for l in stash_r.stdout.strip().split('\n') if l.strip()]
+        if stash_lines:
+            print('检测到 {} 个 stash (可能是 autostash 未弹回), 尝试自动恢复...'.format(len(stash_lines)))
+            # P1-6: 自动尝试 stash pop 恢复用户的草稿
+            pop_r = git('stash', 'pop')
+            if pop_r.returncode == 0:
+                print('  [OK] stash 已自动恢复 (你的改动回来了)')
+            else:
+                print('  WARNING: stash pop 失败, 你的改动可能还在 stash 里')
+                print('  手动恢复: git stash list → git stash pop')
     print('SYNC_CONFLICT: 自动同步遇到冲突, 已安全回退 (本地产出未丢失)。')
     branch = current_branch()
     print('AI 请按以下步骤解决冲突:')
@@ -264,7 +270,11 @@ def _stage_scopes_safely(skip_secret=False):
             fpath = line[3:]
             if status[0] == '?' or status[1] == '?':  # 未跟踪
                 ext = os.path.splitext(fpath)[1].lower()
-                if ext in SAFE_EXTENSIONS:
+                # PRD-4: 拒绝 brainstorm 中间文件
+                basename = os.path.basename(fpath)
+                if 'brainstorm-agent' in basename:
+                    skipped.append(fpath + ' (brainstorm 中间文件, 不提交)')
+                elif ext in SAFE_EXTENSIONS:
                     git('add', '--', fpath)
                     staged += 1
                 else: