@hupan56/wlkj 3.3.13 → 3.3.15

package/templates/qoder/scripts/capability/registry.py

@@ -1,245 +1,245 @@
-# -*- coding: utf-8 -*-
-"""
-capability.registry —— 宿主发现 + Nexus Facade。
-
-设计模式:
-    - Registry（HOST_TABLE 单一事实源，泛化 common.active_task._ENV_SESSION_KEYS）
-    - Facade（resolve() 一行入口）
-    - Bridge（Cap 抽象 × 宿主实现 正交）
-
-主轴: 工作流面向能力编程，不面向宿主。
-    cap = resolve()
-    cap.memory.recall(...)   # 不管在 QoderWork 还是 CLI，同一行代码
-"""
-from __future__ import annotations
-
-import os
-from typing import Any
-
-from .caps import (
-    NoOpPresentCap,
-)
-
-
-# =============================================================================
-# HOST_TABLE —— 宿主注册表
-# -----------------------------------------------------------------------------
-# 泛化 common/active_task.py:_ENV_SESSION_KEYS 的 7 宿主表：
-#   从"只探测身份"扩展为"身份 + 能力清单"。
-#
-# 现在最小形态: Python dict。
-# 未来完整形态: manifests/*.yaml 声明式文件（每宿主一份）。
-# 迁移路径: dict → yaml，resolve() 接口不变，工作流零改动。
-# =============================================================================
-
-HOST_TABLE: dict[str, dict] = {
-    # ── Qoder 系列（第一宿主系列，2026-07 对齐最新产品线）─────────────
-    # 主开发宿主 + 办公产品。（Qoder CLI / Cloud Agents 后续按需再加；QoderWake 架构性不接。）
-    #   features = 引擎已接（非 NoOp adapter）；native = 产品原生能力（仅建模，不算实现）。
-    "qoder-desktop": {
-        # Qoder 1.0 "Autonomous Development Desktop"（原 qoder-ide；Quest Window/Agent Mode 是其模式，故原 qoder-quest 合并于此）
-        "detect": ("QODER_DESKTOP", "QODER_IDE"),
-        "features": ("mcp", "memory", "cron", "present"),
-        "native": ("agent-mode", "context-engine", "vm-sandbox", "hooks", "skills", "mcp-sse"),
-        "mcp_servers": ["qoder-knowledge-graph", "qoder-zentao", "qoder-mysql", "lanhu"],
-        "note": "Qoder Desktop/IDE 1.0（主开发宿主；Quest 是其模式，非独立宿主）",
-    },
-    "qoder-work": {
-        # QoderWork：办公产品（非开发者，文档/报告/PPT/M365）。~/.qoderwork/ 投影 + qoder_show_widget 是其接入点。
-        "detect": ("QODER_SESSION_ID",),
-        "features": ("mcp", "memory", "cron", "present"),
-        "native": ("office-agent", "m365", "human-in-loop", "hooks", "show-widget"),
-        "mcp_servers": ["qoder-knowledge-graph", "qoder-zentao", "qoder-mysql", "lanhu"],
-        "note": "QoderWork 桌面办公 Agent（非开发者；文档/PPT/M365）；~/.qoderwork/ 投影入口",
-    },
-    # ── 其他宿主（通用 AI 工具）────────────────────────────────
-    "codex": {
-        "detect": ("CODEX_SESSION_ID", "CODEX_THREAD_ID"),
-        "features": ("repo", "identity"),
-        "mcp_servers": [],
-        "note": "OpenAI Codex CLI",
-    },
-    "claude": {
-        "detect": ("CLAUDE_SESSION_ID", "CLAUDE_CODE_SESSION_ID"),
-        "features": ("repo", "identity"),
-        "mcp_servers": [],
-        "note": "Claude Code",
-    },
-    "cursor": {
-        "detect": ("CURSOR_SESSION_ID",),
-        "features": ("repo", "identity"),
-        "mcp_servers": [],
-    },
-    "opencode": {
-        "detect": ("OPENCODE_SESSION_ID", "OPENCODE_RUN_ID"),
-        "features": ("repo", "identity"),
-        "mcp_servers": [],
-    },
-    "gemini": {
-        "detect": ("GEMINI_SESSION_ID",),
-        "features": ("repo", "identity"),
-        "mcp_servers": [],
-    },
-    "copilot": {
-        "detect": ("COPILOT_SESSION_ID",),
-        "features": ("repo", "identity"),
-        "mcp_servers": [],
-    },
-    # ── 兜底 ──────────────────────────────────────────────────
-    "cli": {
-        "detect": (),  # 兜底：无 env 命中即为 CLI / 任意宿主
-        "features": ("repo", "identity", "context", "memory", "mcp"),
-        # 本地 stdio transport 经 mcp_launcher spawn 子进程, 不依赖宿主原生 MCP。
-        # 故 CLI 能起全部本地 server (kg/zentao/mysql/lanhu), 与 QoderWork 等价。
-        "mcp_servers": ["qoder-knowledge-graph", "qoder-zentao", "qoder-mysql", "lanhu"],
-        "note": "纯 CLI 兜底; MCP 走本地 spawn (非宿主原生), 其余走文件降级",
-    },
-}
-
-
-def detect_host() -> str:
-    """探测当前宿主名。
-
-    遍历 HOST_TABLE，第一个 env 命中的返回；无则 'cli'。
-    单一事实源 —— 替代散落在 active_task / autotest / mcp_launcher 的多处宿主探测。
-    """
-    for name, info in HOST_TABLE.items():
-        if name == "cli":
-            continue
-        for env_var in info.get("detect", ()):
-            if os.environ.get(env_var):
-                return name
-    return "cli"
-
-
-# =============================================================================
-# Nexus Facade
-# =============================================================================
-
-class Nexus:
-    """宿主能力 Facade —— 聚合所有能力，对外统一入口。
-
-    工作流永远只调 resolve() 拿到本对象，再访问 .memory/.mcp/...，
-    不直接 import 任何 adapter（Facade 模式）。
-    """
-
-    def __init__(self, host_name: str, repo, identity, context, memory,
-                 cron, notify, present, sandbox, mcp):
-        self.host_name = host_name
-        self.repo = repo
-        self.identity = identity
-        self.context = context
-        self.memory = memory
-        self.cron = cron
-        self.notify = notify
-        self.present = present
-        self.sandbox = sandbox
-        self.mcp = mcp
-
-    def describe(self) -> dict:
-        """诊断：当前宿主 + 各能力 available 状态。"""
-        return {
-            "host": self.host_name,
-            "capabilities": {
-                "repo": _avail(self.repo),
-                "identity": _avail(self.identity),
-                "context": _avail(self.context),
-                "memory": _avail(self.memory),
-                "cron": _avail(self.cron),
-                "notify": _avail(self.notify),
-                "present": _avail(self.present),
-                "sandbox": _avail(self.sandbox),
-                "mcp": _avail(self.mcp),
-            },
-        }
-
-
-def _avail(cap) -> bool:
-    return bool(getattr(cap, "available", False))
-
-
-# =============================================================================
-# 能力装配（Bridge: Cap 抽象 × 宿主实现 正交）
-# -----------------------------------------------------------------------------
-# 每个 _resolve_xxx 是一个能力的装配点。新增能力（场景 B）= 加一个 _resolve_xxx
-# + Nexus 属性。新增宿主实现 = 在对应 _resolve_xxx 里按 host 名分支。
-# =============================================================================
-
-def _resolve_repo(host: str):
-    """核心能力：所有宿主都用文件降级版（无 ~/.qoderwork 依赖）。"""
-    from .adapters.cli import FileRepoCap
-    return FileRepoCap()
-
-
-def _resolve_identity(host: str):
-    from .adapters.cli import FileIdentityCap
-    return FileIdentityCap()
-
-
-def _resolve_context(host: str):
-    from .adapters.cli import FileContextCap
-    return FileContextCap()
-
-
-def _resolve_memory(host: str):
-    """memory —— 职责链样板（见 memory_chain.py）。"""
-    from .memory_chain import build_memory_chain
-    return build_memory_chain(host)
-
-
-def _resolve_cron(host: str):
-    from .adapters.qw import QwCronCap
-    return QwCronCap()  # 文件系统 cron，不依赖宿主
-
-
-def _resolve_notify(host: str):
-    """L2 通知 —— 配了 WLKJ_NOTIFY_WEBHOOKS→WebhookNotifyCap(飞书/企微/钉钉);否则 NoOp 降级。"""
-    from .caps.notify import default_notify
-    return default_notify()
-
-
-def _resolve_present(host: str):
-    """L2 富展示 —— Qoder Desktop/Work 调 qoder_show_widget 嵌入对话; 其余 NoOp 降级表格。"""
-    if host in ("qoder-desktop", "qoder-work"):
-        try:
-            from .adapters.qw import QwPresentCap
-            return QwPresentCap()
-        except Exception:
-            pass
-    return NoOpPresentCap()
-
-
-def _resolve_sandbox(host: str):
-    """L2 安全执行 —— env WLKJ_SANDBOX≠off→SubprocessSandboxCap(进程级隔离+超时);off→NoOp。"""
-    from .caps.sandbox import default_sandbox
-    return default_sandbox()
-
-
-def _resolve_mcp(host: str):
-    """L1 MCP 统一入口 —— 根据宿主声明的 mcp_servers 决定 spawn 哪些。"""
-    from .adapters.mcp import McpCap
-    info = HOST_TABLE.get(host, {})
-    mcp_servers = info.get("mcp_servers")
-    return McpCap(mcp_servers=mcp_servers)
-
-
-def resolve() -> Nexus:
-    """解析当前环境，返回 Nexus Facade。
-
-    一行入口: cap = resolve()
-    内部: detect_host → 按宿主装配各 Cap → 注入 NoOp 兜底。
-    工作流代码零宿主感知。
-    """
-    host = detect_host()
-    return Nexus(
-        host_name=host,
-        repo=_resolve_repo(host),
-        identity=_resolve_identity(host),
-        context=_resolve_context(host),
-        memory=_resolve_memory(host),
-        cron=_resolve_cron(host),
-        notify=_resolve_notify(host),
-        present=_resolve_present(host),
-        sandbox=_resolve_sandbox(host),
-        mcp=_resolve_mcp(host),
-    )
+# -*- coding: utf-8 -*-
+"""
+capability.registry —— 宿主发现 + Nexus Facade。
+
+设计模式:
+    - Registry（HOST_TABLE 单一事实源，泛化 common.active_task._ENV_SESSION_KEYS）
+    - Facade（resolve() 一行入口）
+    - Bridge（Cap 抽象 × 宿主实现 正交）
+
+主轴: 工作流面向能力编程，不面向宿主。
+    cap = resolve()
+    cap.memory.recall(...)   # 不管在 QoderWork 还是 CLI，同一行代码
+"""
+from __future__ import annotations
+
+import os
+from typing import Any
+
+from .caps import (
+    NoOpPresentCap,
+)
+
+
+# =============================================================================
+# HOST_TABLE —— 宿主注册表
+# -----------------------------------------------------------------------------
+# 泛化 common/active_task.py:_ENV_SESSION_KEYS 的 7 宿主表：
+#   从"只探测身份"扩展为"身份 + 能力清单"。
+#
+# 现在最小形态: Python dict。
+# 未来完整形态: manifests/*.yaml 声明式文件（每宿主一份）。
+# 迁移路径: dict → yaml，resolve() 接口不变，工作流零改动。
+# =============================================================================
+
+HOST_TABLE: dict[str, dict] = {
+    # ── Qoder 系列（第一宿主系列，2026-07 对齐最新产品线）─────────────
+    # 主开发宿主 + 办公产品。（Qoder CLI / Cloud Agents 后续按需再加；QoderWake 架构性不接。）
+    #   features = 引擎已接（非 NoOp adapter）；native = 产品原生能力（仅建模，不算实现）。
+    "qoder-desktop": {
+        # Qoder 1.0 "Autonomous Development Desktop"（原 qoder-ide；Quest Window/Agent Mode 是其模式，故原 qoder-quest 合并于此）
+        "detect": ("QODER_DESKTOP", "QODER_IDE"),
+        "features": ("mcp", "memory", "cron", "present"),
+        "native": ("agent-mode", "context-engine", "vm-sandbox", "hooks", "skills", "mcp-sse"),
+        "mcp_servers": ["qoder-knowledge-graph", "qoder-zentao", "qoder-mysql", "lanhu"],
+        "note": "Qoder Desktop/IDE 1.0（主开发宿主；Quest 是其模式，非独立宿主）",
+    },
+    "qoder-work": {
+        # QoderWork：办公产品（非开发者，文档/报告/PPT/M365）。~/.qoderwork/ 投影 + qoder_show_widget 是其接入点。
+        "detect": ("QODER_SESSION_ID",),
+        "features": ("mcp", "memory", "cron", "present"),
+        "native": ("office-agent", "m365", "human-in-loop", "hooks", "show-widget"),
+        "mcp_servers": ["qoder-knowledge-graph", "qoder-zentao", "qoder-mysql", "lanhu"],
+        "note": "QoderWork 桌面办公 Agent（非开发者；文档/PPT/M365）；~/.qoderwork/ 投影入口",
+    },
+    # ── 其他宿主（通用 AI 工具）────────────────────────────────
+    "codex": {
+        "detect": ("CODEX_SESSION_ID", "CODEX_THREAD_ID"),
+        "features": ("repo", "identity"),
+        "mcp_servers": [],
+        "note": "OpenAI Codex CLI",
+    },
+    "claude": {
+        "detect": ("CLAUDE_SESSION_ID", "CLAUDE_CODE_SESSION_ID"),
+        "features": ("repo", "identity"),
+        "mcp_servers": [],
+        "note": "Claude Code",
+    },
+    "cursor": {
+        "detect": ("CURSOR_SESSION_ID",),
+        "features": ("repo", "identity"),
+        "mcp_servers": [],
+    },
+    "opencode": {
+        "detect": ("OPENCODE_SESSION_ID", "OPENCODE_RUN_ID"),
+        "features": ("repo", "identity"),
+        "mcp_servers": [],
+    },
+    "gemini": {
+        "detect": ("GEMINI_SESSION_ID",),
+        "features": ("repo", "identity"),
+        "mcp_servers": [],
+    },
+    "copilot": {
+        "detect": ("COPILOT_SESSION_ID",),
+        "features": ("repo", "identity"),
+        "mcp_servers": [],
+    },
+    # ── 兜底 ──────────────────────────────────────────────────
+    "cli": {
+        "detect": (),  # 兜底：无 env 命中即为 CLI / 任意宿主
+        "features": ("repo", "identity", "context", "memory", "mcp"),
+        # 本地 stdio transport 经 mcp_launcher spawn 子进程, 不依赖宿主原生 MCP。
+        # 故 CLI 能起全部本地 server (kg/zentao/mysql/lanhu), 与 QoderWork 等价。
+        "mcp_servers": ["qoder-knowledge-graph", "qoder-zentao", "qoder-mysql", "lanhu"],
+        "note": "纯 CLI 兜底; MCP 走本地 spawn (非宿主原生), 其余走文件降级",
+    },
+}
+
+
+def detect_host() -> str:
+    """探测当前宿主名。
+
+    遍历 HOST_TABLE，第一个 env 命中的返回；无则 'cli'。
+    单一事实源 —— 替代散落在 active_task / autotest / mcp_launcher 的多处宿主探测。
+    """
+    for name, info in HOST_TABLE.items():
+        if name == "cli":
+            continue
+        for env_var in info.get("detect", ()):
+            if os.environ.get(env_var):
+                return name
+    return "cli"
+
+
+# =============================================================================
+# Nexus Facade
+# =============================================================================
+
+class Nexus:
+    """宿主能力 Facade —— 聚合所有能力，对外统一入口。
+
+    工作流永远只调 resolve() 拿到本对象，再访问 .memory/.mcp/...，
+    不直接 import 任何 adapter（Facade 模式）。
+    """
+
+    def __init__(self, host_name: str, repo, identity, context, memory,
+                 cron, notify, present, sandbox, mcp):
+        self.host_name = host_name
+        self.repo = repo
+        self.identity = identity
+        self.context = context
+        self.memory = memory
+        self.cron = cron
+        self.notify = notify
+        self.present = present
+        self.sandbox = sandbox
+        self.mcp = mcp
+
+    def describe(self) -> dict:
+        """诊断：当前宿主 + 各能力 available 状态。"""
+        return {
+            "host": self.host_name,
+            "capabilities": {
+                "repo": _avail(self.repo),
+                "identity": _avail(self.identity),
+                "context": _avail(self.context),
+                "memory": _avail(self.memory),
+                "cron": _avail(self.cron),
+                "notify": _avail(self.notify),
+                "present": _avail(self.present),
+                "sandbox": _avail(self.sandbox),
+                "mcp": _avail(self.mcp),
+            },
+        }
+
+
+def _avail(cap) -> bool:
+    return bool(getattr(cap, "available", False))
+
+
+# =============================================================================
+# 能力装配（Bridge: Cap 抽象 × 宿主实现 正交）
+# -----------------------------------------------------------------------------
+# 每个 _resolve_xxx 是一个能力的装配点。新增能力（场景 B）= 加一个 _resolve_xxx
+# + Nexus 属性。新增宿主实现 = 在对应 _resolve_xxx 里按 host 名分支。
+# =============================================================================
+
+def _resolve_repo(host: str):
+    """核心能力：所有宿主都用文件降级版（无 ~/.qoderwork 依赖）。"""
+    from .adapters.cli import FileRepoCap
+    return FileRepoCap()
+
+
+def _resolve_identity(host: str):
+    from .adapters.cli import FileIdentityCap
+    return FileIdentityCap()
+
+
+def _resolve_context(host: str):
+    from .adapters.cli import FileContextCap
+    return FileContextCap()
+
+
+def _resolve_memory(host: str):
+    """memory —— 职责链样板（见 memory_chain.py）。"""
+    from .memory_chain import build_memory_chain
+    return build_memory_chain(host)
+
+
+def _resolve_cron(host: str):
+    from .adapters.qw import QwCronCap
+    return QwCronCap()  # 文件系统 cron，不依赖宿主
+
+
+def _resolve_notify(host: str):
+    """L2 通知 —— 配了 WLKJ_NOTIFY_WEBHOOKS→WebhookNotifyCap(飞书/企微/钉钉);否则 NoOp 降级。"""
+    from .caps.notify import default_notify
+    return default_notify()
+
+
+def _resolve_present(host: str):
+    """L2 富展示 —— Qoder Desktop/Work 调 qoder_show_widget 嵌入对话; 其余 NoOp 降级表格。"""
+    if host in ("qoder-desktop", "qoder-work"):
+        try:
+            from .adapters.qw import QwPresentCap
+            return QwPresentCap()
+        except Exception:
+            pass
+    return NoOpPresentCap()
+
+
+def _resolve_sandbox(host: str):
+    """L2 安全执行 —— env WLKJ_SANDBOX≠off→SubprocessSandboxCap(进程级隔离+超时);off→NoOp。"""
+    from .caps.sandbox import default_sandbox
+    return default_sandbox()
+
+
+def _resolve_mcp(host: str):
+    """L1 MCP 统一入口 —— 根据宿主声明的 mcp_servers 决定 spawn 哪些。"""
+    from .adapters.mcp import McpCap
+    info = HOST_TABLE.get(host, {})
+    mcp_servers = info.get("mcp_servers")
+    return McpCap(mcp_servers=mcp_servers)
+
+
+def resolve() -> Nexus:
+    """解析当前环境，返回 Nexus Facade。
+
+    一行入口: cap = resolve()
+    内部: detect_host → 按宿主装配各 Cap → 注入 NoOp 兜底。
+    工作流代码零宿主感知。
+    """
+    host = detect_host()
+    return Nexus(
+        host_name=host,
+        repo=_resolve_repo(host),
+        identity=_resolve_identity(host),
+        context=_resolve_context(host),
+        memory=_resolve_memory(host),
+        cron=_resolve_cron(host),
+        notify=_resolve_notify(host),
+        present=_resolve_present(host),
+        sandbox=_resolve_sandbox(host),
+        mcp=_resolve_mcp(host),
+    )

package/templates/qoder/scripts/deployment/setup/install_qoderwork.py

@@ -438,6 +438,20 @@ def rewrite_mcp_json_for_launcher():
     }
     changed = False
     for srv, sub in name_map.items():
+        # 共识：kg 走云平台（默认 10.89.7.120:10010/mcp，config platform_mcp.url 可覆盖）
+        if srv == "qoder-knowledge-graph":
+            _pm = "http://10.89.7.120:10010/mcp"
+            try:
+                import yaml as _y
+                _cfg_p = get_repo_root() / ".qoder" / "config.yaml"
+                if _cfg_p.is_file():
+                    _cfg = _y.safe_load(_cfg_p.read_text(encoding="utf-8")) or {}
+                    _pm = (_cfg.get("platform_mcp") or {}).get("url", "") or _pm
+            except Exception:
+                pass
+            servers[srv] = {"url": _pm, "type": "sse", "enabled": True}
+            changed = True
+            continue
         entry = servers.get(srv)
         # 全新机器: kg/mysql/lanhu 条目可能不存在 → 创建它 (launcher 模式)
         if not entry:

package/templates/qoder/scripts/deployment/setup/setup.py

@@ -1,16 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Windows 控制台 UTF-8 修复（ctypes 直调 Windows API，非子shell chcp）
-import sys as _s
-if _s.platform == 'win32':
-    import ctypes as _ct, io as _io
-    try:
-        _ct.windll.kernel32.SetConsoleOutputCP(65001)
-        _ct.windll.kernel32.SetConsoleCP(65001)
-        _s.stdout = _io.TextIOWrapper(_s.stdout.buffer, encoding='utf-8', errors='replace')
-        _s.stderr = _io.TextIOWrapper(_s.stderr.buffer, encoding='utf-8', errors='replace')
-    except Exception:
-        pass
 # v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
 import os as _o, sys as _s
 _f = _o.path.abspath(__file__)