@hupan56/wlkj 2.7.12 → 3.0.0

package/templates/qoder/scripts/task/__init__.py

@@ -0,0 +1,11 @@
+# 子包初始化: 注入 scripts/根 + 所有子包到 sys.path
+# 让跨包 import (旧式不带前缀) 仍可用, 兼容现有代码
+import os as _os, sys as _sys
+_root = _os.path.dirname(_os.path.dirname(_os.path.abspath(__file__)))
+if _root not in _sys.path:
+    _sys.path.insert(0, _root)
+# 注入所有子包目录 (兼容旧式 import xxx)
+for _sub in ('kg', 'build', 'test', 'setup', 'io'):
+    _subdir = _os.path.join(_root, _sub)
+    if _os.path.isdir(_subdir) and _subdir not in _sys.path:
+        _sys.path.insert(0, _subdir)

package/templates/qoder/scripts/{git_sync.py → task/git_sync.py}

@@ -1,5 +1,11 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+
 """
 Weekly Knowledge Graph Update
 
@@ -50,7 +56,7 @@ def load_json(path, default=None):
         try:
             with open(path, 'r', encoding='utf-8') as f:
                 return json.load(f)
-        except:
+        except Exception:
             pass
     return default or {}
 
@@ -63,15 +69,43 @@ def save_json(path, data):
 
 
 def load_config():
-    """Load config from config.yaml"""
-    if not os.path.exists(CONFIG_PATH):
-        return {}
+    """Load config from config.yaml (v3.0: 转发到 Config 单例, 带缓存)。"""
     try:
-        import yaml
-        with open(CONFIG_PATH, 'r', encoding='utf-8') as f:
-            return yaml.safe_load(f) or {}
-    except:
-        return {}
+        from common.config import Config
+        return Config.load().raw
+    except Exception:
+        # 回退: 直接读 (sys.path 未就绪时)
+        if not os.path.exists(CONFIG_PATH):
+            return {}
+        try:
+            import yaml
+            with open(CONFIG_PATH, 'r', encoding='utf-8') as f:
+                return yaml.safe_load(f) or {}
+        except Exception:
+            return {}
+
+
+def _git(*args, cwd=None, timeout=None):
+    """git 命令包装(复刻 team_sync.git 风格)。
+
+    网络/远程操作 (fetch/pull/push/clone) 必须传 timeout —— 50 人团队周五 cron
+    跑时, 远程要认证但凭证没缓存 / 弱网 / 仓库不存在, 会让裸 subprocess.run 永久
+    阻塞, 整个周五同步挂死。本地操作 (rev-parse/diff/log) 可不传。
+
+    timeout 到期返回 rc=124 (与 timeout 命令一致), 不让 cron 无限阻塞。
+    git 未安装返回 rc=127, 不崩溃。
+    """
+    try:
+        kw = dict(cwd=cwd, capture_output=True, text=True, encoding='utf-8', errors='replace')
+        if timeout:
+            kw['timeout'] = timeout
+        return subprocess.run(['git'] + list(args), **kw)
+    except FileNotFoundError:
+        import types
+        return types.SimpleNamespace(returncode=127, stdout='', stderr='git not installed')
+    except subprocess.TimeoutExpired:
+        import types
+        return types.SimpleNamespace(returncode=124, stdout='', stderr='git {} timed out after {}s'.format(' '.join(args[:3]), timeout))
 
 
 # ============================================================
@@ -86,32 +120,22 @@ def git_pull_project(project_name):
         return []
 
     # Get current commit before pull
-    result = subprocess.run(
-        ['git', 'rev-parse', 'HEAD'],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('rev-parse', 'HEAD', cwd=project_dir)
     old_commit = result.stdout.strip()[:8] if result.returncode == 0 else ''
 
-    # Fetch + pull
+    # Fetch + pull (网络操作必须带 timeout, 防弱网/认证弹窗挂死周五 cron)
     print(f'  {project_name}: Fetching...')
-    subprocess.run(['git', 'fetch', 'origin'],
-                   cwd=project_dir, capture_output=True)
+    _git('fetch', 'origin', cwd=project_dir, timeout=120)
 
     print(f'  {project_name}: Pulling...')
-    result = subprocess.run(
-        ['git', 'pull', 'origin'],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('pull', 'origin', cwd=project_dir, timeout=180)
 
     if result.returncode != 0:
-        print(f'  {project_name}: Pull failed - {result.stderr[:100]}')
+        print(f'  {project_name}: Pull failed - {(result.stderr or "")[:100]}')
         return []
 
     # Get new commit
-    result = subprocess.run(
-        ['git', 'rev-parse', 'HEAD'],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('rev-parse', 'HEAD', cwd=project_dir)
     new_commit = result.stdout.strip()[:8] if result.returncode == 0 else ''
 
     if old_commit == new_commit:
@@ -119,10 +143,7 @@ def git_pull_project(project_name):
         return []
 
     # Get changed files
-    result = subprocess.run(
-        ['git', 'diff', '--name-only', old_commit, new_commit],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('diff', '--name-only', old_commit, new_commit, cwd=project_dir)
     changed = [f.strip() for f in result.stdout.strip().split('\n') if f.strip()]
     print(f'  {project_name}: {old_commit} -> {new_commit}, {len(changed)} files changed')
     return changed
@@ -383,7 +404,7 @@ def parse_java_file(filepath):
             'keywords': re.findall('[A-Z]?[a-z]+', class_name or '') if class_name else []
         }
         entities.append(entity)
-    except:
+    except Exception:
         pass
     return entities
 
@@ -411,7 +432,7 @@ def parse_frontend_file(filepath):
             'type': 'vue' if filepath.endswith('.vue') else 'js/ts'
         }
         entities.append(entity)
-    except:
+    except Exception:
         pass
     return entities
 

package/templates/qoder/scripts/{syncgate.py → task/syncgate.py}

@@ -1,4 +1,10 @@
 # -*- coding: utf-8 -*-
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+
 """
 syncgate.py - team_sync 推送前的零信任门禁
 

package/templates/qoder/scripts/task/task.py

@@ -0,0 +1,221 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+QODER Pipeline - 任务生命周期管理
+
+完整的任务 CRUD 和生命周期管理:
+- create: 创建任务 (含 task.json, prd.md 模板, implement.jsonl, check.jsonl)
+- start: 开始任务 (设置活跃任务, 状态 planning -> in_progress)
+- current: 查看当前活跃任务
+- finish: 完成任务 (清除活跃任务)
+- archive: 归档任务 (移动到 archive/ 目录)
+- list: 列出活跃/归档任务
+- show: 查看任务详情
+- reassign: 改派任务负责人 (多角色协作, PM 建任务后转给开发)
+- add-subtask / remove-subtask: 父子任务关联
+- set-due / block / unblock / gantt: 排期与依赖
+
+参考: Trellis 的 task.py 设计
+
+Usage:
+    python task.py create "<title>" [--slug <name>] [--assignee <dev>] [--priority P0|P1|P2|P3]
+    python task.py start <name>
+    python task.py current [--source]
+    python task.py finish
+    python task.py archive <name>
+    python task.py reassign <name> <new_assignee>
+    python task.py list [--mine] [--status <s>]
+    python task.py add-subtask <parent> <child>
+    python task.py remove-subtask <parent> <child>
+"""
+
+from __future__ import annotations
+
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+
+import argparse
+import json
+import os
+import shutil
+import sys
+from datetime import datetime
+from pathlib import Path
+
+# 将 scripts 目录加入路径
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+from common.paths import (
+    DIR_TASKS,
+    DIR_ARCHIVE,
+    FILE_TASK_JSON,
+    get_repo_root,
+    get_developer,
+    get_tasks_dir,
+)
+from common.active_task import (
+    clear_active_task,
+    resolve_active_task,
+    resolve_context_key,
+    set_active_task,
+)
+from common.task_utils import (
+    resolve_task_dir,
+    run_task_hooks,
+    load_task_json,
+    write_task_json,
+    modify_task_json,
+    assert_can_modify_task,
+)
+
+
+# =============================================================================
+# 命令: create
+# =============================================================================
+
+
+# v3.0 f6: cmd_* 拆到三个模块
+from task_lifecycle import cmd_create, cmd_start, cmd_current, cmd_finish, cmd_archive
+from task_query import cmd_list, cmd_show
+from task_relations import cmd_add_subtask, cmd_remove_subtask, cmd_set_due, cmd_reassign, cmd_block, cmd_unblock, cmd_gantt
+
+
+def main() -> int:
+    """CLI 入口。v3.0: 用 cmd_registry 声明式注册 (消除 ~81 行 argparse 样板)。"""
+    try:
+        from common.cmd_registry import run_command
+    except ImportError:
+        # 回退: 内联 parser (common 不可用时)
+        return _main_legacy()
+
+    COMMANDS = [
+        ('create', 'Create a new task', [
+            ('title', {'help': 'Task title'}),
+            ('--slug', {'help': 'URL-safe slug (auto-generated if omitted)'}),
+            ('--assignee', {'help': 'Assignee (defaults to current developer)'}),
+            ('--priority', {'choices': ['P0', 'P1', 'P2', 'P3'], 'default': 'P2'}),
+        ], cmd_create),
+        ('start', 'Start a task', [
+            ('dir', {'help': 'Task directory or name'}),
+        ], cmd_start),
+        ('current', 'Show current task', [
+            ('--source', {'action': 'store_true', 'help': 'Show source info'}),
+        ], cmd_current),
+        ('finish', 'Finish current task', [], cmd_finish),
+        ('archive', 'Archive a task', [
+            ('dir', {'help': 'Task directory or name'}),
+        ], cmd_archive),
+        ('list', 'List tasks', [
+            ('--mine', {'action': 'store_true', 'help': 'Only my tasks (assignee or creator)'}),
+            ('--status', {'help': 'Filter by status'}),
+            ('--ready', {'action': 'store_true', 'help': '只显示可立即开始的 (无未完成依赖)'}),
+            ('--blocked', {'action': 'store_true', 'help': '只显示被阻塞的任务'}),
+        ], cmd_list),
+        ('show', 'Show task details', [
+            ('dir', {'help': 'Task directory or name'}),
+        ], cmd_show),
+        ('add-subtask', 'Add subtask', [
+            ('parent', {'help': 'Parent task'}),
+            ('child', {'help': 'Child task'}),
+        ], cmd_add_subtask),
+        ('remove-subtask', 'Remove subtask', [
+            ('parent', {'help': 'Parent task'}),
+            ('child', {'help': 'Child task'}),
+        ], cmd_remove_subtask),
+        ('set-due', 'Set due date (YYYY-MM-DD)', [
+            ('task', {'help': 'Task name'}),
+            ('due_date', {'help': 'Due date YYYY-MM-DD'}),
+        ], cmd_set_due),
+        ('reassign', 'Reassign task to another developer', [
+            ('task', {'help': 'Task name'}),
+            ('new_assignee', {'help': 'New assignee (developer name)'}),
+        ], cmd_reassign),
+        ('block', 'Mark task blocked by another', [
+            ('task', {'help': 'Task that is blocked'}),
+            ('blocker', {'help': 'Task that blocks it (must finish first)'}),
+        ], cmd_block),
+        ('unblock', 'Remove block relationship', [
+            ('task', {'help': 'Task'}),
+            ('blocker', {'help': 'Blocker task'}),
+        ], cmd_unblock),
+        ('gantt', 'Render markdown Gantt chart', [
+            ('--weeks', {'type': int, 'default': 4, 'help': 'Number of weeks to show'}),
+        ], cmd_gantt),
+    ]
+    return run_command(COMMANDS, prog='task', description='QODER Task Management')
+
+
+def _main_legacy() -> int:
+    """回退: common.cmd_registry 不可用时的内联 argparse (与旧版行为一致)。"""
+    parser = argparse.ArgumentParser(description="QODER Task Management")
+    subparsers = parser.add_subparsers(dest="command", help="Available commands")
+
+    p_create = subparsers.add_parser("create", help="Create a new task")
+    p_create.add_argument("title", help="Task title")
+    p_create.add_argument("--slug", help="URL-safe slug (auto-generated if omitted)")
+    p_create.add_argument("--assignee", help="Assignee (defaults to current developer)")
+    p_create.add_argument("--priority", choices=["P0", "P1", "P2", "P3"], default="P2")
+    p_create.set_defaults(func=cmd_create)
+
+    p_start = subparsers.add_parser("start", help="Start a task")
+    p_start.add_argument("dir", help="Task directory or name")
+    p_start.set_defaults(func=cmd_start)
+
+    p_current = subparsers.add_parser("current", help="Show current task")
+    p_current.add_argument("--source", action="store_true", help="Show source info")
+    p_current.set_defaults(func=cmd_current)
+
+    p_finish = subparsers.add_parser("finish", help="Finish current task")
+    p_finish.set_defaults(func=cmd_finish)
+
+    p_archive = subparsers.add_parser("archive", help="Archive a task")
+    p_archive.add_argument("dir", help="Task directory or name")
+    p_archive.set_defaults(func=cmd_archive)
+
+    p_list = subparsers.add_parser("list", help="List tasks")
+    p_list.add_argument("--mine", action="store_true", help="Only my tasks")
+    p_list.add_argument("--status", help="Filter by status")
+    p_list.add_argument("--ready", action="store_true", help="可立即开始")
+    p_list.add_argument("--blocked", action="store_true", help="被阻塞")
+    p_list.set_defaults(func=cmd_list)
+
+    p_show = subparsers.add_parser("show", help="Show task details")
+    p_show.add_argument("dir", help="Task directory or name")
+    p_show.set_defaults(func=cmd_show)
+
+    for cmd, fn in [
+        ("add-subtask", cmd_add_subtask), ("remove-subtask", cmd_remove_subtask),
+    ]:
+        p = subparsers.add_parser(cmd)
+        p.add_argument("parent"); p.add_argument("child")
+        p.set_defaults(func=fn)
+
+    p_due = subparsers.add_parser("set-due")
+    p_due.add_argument("task"); p_due.add_argument("due_date")
+    p_due.set_defaults(func=cmd_set_due)
+
+    p_reassign = subparsers.add_parser("reassign")
+    p_reassign.add_argument("task"); p_reassign.add_argument("new_assignee")
+    p_reassign.set_defaults(func=cmd_reassign)
+
+    for cmd, fn in [("block", cmd_block), ("unblock", cmd_unblock)]:
+        p = subparsers.add_parser(cmd)
+        p.add_argument("task"); p.add_argument("blocker")
+        p.set_defaults(func=fn)
+
+    p_gantt = subparsers.add_parser("gantt")
+    p_gantt.add_argument("--weeks", type=int, default=4)
+    p_gantt.set_defaults(func=cmd_gantt)
+
+    args = parser.parse_args()
+    if not hasattr(args, "func"):
+        parser.print_help()
+        return 1
+    return args.func(args)
+
+
+if __name__ == "__main__":
+    sys.exit(main())