@hupan56/wlkj 3.1.5 → 3.1.6

package/package.json

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

package/templates/qoder/scripts/validation/test/autotest_auth.py

@@ -28,14 +28,20 @@ import sys
 
 __all__ = ["get_developer", "auth_file", "get_token", "MEMBER_DIR"]
 
-# 相对导入
-try:
-    from .paths import get_repo_root
-except ImportError:
-    _COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
-    if _COMMON_DIR not in sys.path:
-        sys.path.insert(0, _COMMON_DIR)
-    from paths import get_repo_root  # type: ignore
+# v3.x: 统一用 foundation.core.paths (旧代码 from .paths / from paths 都不存在,
+#       只因外层 try/except 兜底才没崩, 但 autotest_run 用 `from test.autotest_auth`
+#       时相对导入失败 → 整个模块导入失败 → 单一真源形同虚设)。
+# 路径自举: 找到 foundation/bootstrap.py 并 setup()
+_COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
+_f = _COMMON_DIR
+for _ in range(10):
+    _f = os.path.dirname(_f)
+    _cp = os.path.join(_f, 'foundation')
+    if os.path.isfile(os.path.join(_cp, 'bootstrap.py')):
+        break
+if _cp not in sys.path:
+    sys.path.insert(0, _f)  # scripts/ 根, 让 foundation.* 可 import
+from foundation.core.paths import get_repo_root, get_private_file  # noqa: E402
 
 
 def get_developer() -> str:
@@ -59,7 +65,6 @@ MEMBER_DIR = _member_dir  # 模块级便捷别名 (首次 import 时解析)
 def auth_file(dev: str = None) -> str:
     """成员的 auth-state.json 路径 (v3.0: 收进 .private/, 向后兼容)。"""
     try:
-        from .paths import get_private_file
         return str(get_private_file('auth-state.json', dev))
     except Exception:
         return os.path.join(_member_dir(dev), 'auth-state.json')

package/templates/qoder/scripts/validation/test/kg_auto_login.py

@@ -9,7 +9,7 @@ for _ in range(10):
         break
 if _cp not in _s.path: _s.path.insert(0, _cp)
 from bootstrap import setup; setup()
-from foundation.core.paths import get_repo_root
+from foundation.core.paths import get_repo_root
 
 """
 全自动登录: 获取验证码 → ddddocr识别 → 页面JS加密提交 → 保存token
@@ -32,14 +32,15 @@ CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
 RSA_PUBLIC_KEY_B64 = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/EkuOg1gq/t2/PUI8GpcJCsCFQgHkSHUEdk7ZPrEQYd8IM1hFkHmDJrCOQ+qUPqKHG9a5BAI44yE6FuPI9Vvqu2ZrCww/zryR7A+2n5jaKIG2rJG9KHDzT5mAVOJrlhBf8L2i7wZc8eWrNg0md0BlwEowQyVEEj9oIBlw/nqTwIDAQAB'
 
 # 保存路径
-SCRIPTS_DIR = get_repo_root()
+SCRIPTS_DIR = get_repo_root()
 
 
 def _read_developer():
     """读 .qoder/.developer 拿当前开发者名, 用于身份隔离。
     多人共用 workspace 时, auth-state 必须按开发者分目录, 否则会串登录态。
     没有身份 → 抛异常 (绝不 fallback 到 hupan/default, 防串号)。"""
-    dev_file = os.path.join(SCRIPTS_DIR, '..', '..', '.qoder', '.developer')
+    # SCRIPTS_DIR 已是仓库根 (get_repo_root()), 不能再 ../.. (会出仓库)。
+    dev_file = os.path.join(SCRIPTS_DIR, '.qoder', '.developer')
     if os.path.isfile(dev_file):
         for ln in open(dev_file, encoding='utf-8'):
             if ln.strip().startswith('name='):
@@ -50,8 +51,10 @@ def _read_developer():
     )
 
 
-STATE_FILE = os.path.join(SCRIPTS_DIR, '..', '..', 'workspace', 'members',
-                          _read_developer(), 'auth-state.json')
+# auth-state 写到 .private/ (与读取方 autotest_auth.auth_file 对齐,
+# 旧代码写到 workspace/members/<dev>/ 根 → 读取方读 .private/ → 永远读不到新 token)。
+STATE_FILE = os.path.join(SCRIPTS_DIR, 'workspace', 'members',
+                          _read_developer(), '.private', 'auth-state.json')
 
 out = []
 def log(s=''):