Undefined-bot 3.6.5__tar.gz → 3.6.7__tar.gz

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/CHANGELOG.md

@@ -1,3 +1,26 @@
+## v3.6.7 Naga 会话级黑白名单
+
+本版本将 Naga 启用粒度从进程全局细化到群聊/私聊会话：在总闸打开后，可按 `mode` 名单控制具体群与私聊是否启用 NagaAgent 提示词、相关 Agent 与外部网关能力，并保证提示词与工具暴露/执行结论一致。
+
+- 新增 `[naga].mode`（`off` / `blacklist` / `allowlist`）及 `allowed_group_ids` / `blocked_group_ids` / `allowed_private_ids` / `blocked_private_ids`。`allowlist` 下空名单 fail closed（拒绝全部，比 `[access]` 更严）；未知 mode 拒绝。`[features].nagaagent_mode_enabled` 与 `[naga].enabled` 仍为进程总闸。
+- AI 侧（NagaAgent 提示词与 `naga_code_analysis_agent` 工具 schema/执行）与外部网关（`/naga`、绑定、回调投递）共用同一套会话策略；私聊 superadmin 默认绕过私聊名单；群聊无 superadmin 绕过。
+- 每轮请求按会话同步切换：放行时使用 `undefined_nagaagent.xml` 并暴露 Naga Agent，拒绝时回退默认提示词并隐藏/拦截该 Agent。
+- 兼容旧字段 `allowed_groups`（合并至 `allowed_group_ids`；未写 `mode` 时自动 `allowlist`）。策略拒绝时投递返回 `naga policy denied`。
+- 同步配置模板、文档（configuration / slash-commands / naga 契约 / access-control）与策略、命令、Runtime API、提示词/工具回归测试。
+
+---
+
+## v3.6.6 抖音视频提取与媒体信息模式
+
+本版本把抖音视频纳入自动提取、工具调用和文件分析链路：可识别短链、长链与 aweme_id，下载并发送视频合并转发，也可只返回附件 UID 或元信息。同时补齐 B 站与 arXiv 工具的信息模式，并加固抖音真实视频地址探测。
+
+- 新增 Douyin 视频链路。新增 `douyin` 模块与 `douyin_video` 工具，支持抖音短链、`douyin.com/video/<id>` 和裸 aweme_id 解析，可按 `send` / `uid` / `info` 输出发送合并转发、注册附件 UID 或返回视频标题、作者、时长、简介等信息。
+- 接入抖音自动处理管线。普通消息命中抖音链接或 aweme_id 后，可按 `[douyin]` 配置自动下载并发送两节点合并转发；支持独立代理开关、时长与文件大小限制、清晰度探测顺序、群聊/私聊白名单和单条消息处理上限。
+- 加固抖音下载与真实视频探测。下载链路从 SSR share 页提取 `video.play_addr` token，再按清晰度探测 `aweme/v1/play/`；探测优先读取 `Content-Range` 总长度并按文件大小去重，ttid 获取失败时可回退直接请求 share 页，受限视频会返回更明确的过滤原因。
+- 扩展媒体工具信息输出。`bilibili_video` 与 `arxiv_paper` 新增 `output_mode=info`，可只获取视频或论文元信息而不发送/下载附件；`file_analysis_agent` 提示同步覆盖抖音、B 站和 arXiv 的 `uid` / `info` 使用方式。
+
+---
+
 ## v3.6.5 Firecrawl 搜索、代理作用域与热更新连接修复
 
 本版本聚焦联网能力与出站配置治理：`web_agent` 新增 Firecrawl 搜索提供商和搜索优先级控制，代理配置从全局开关收敛为模型与功能段独立启用，并修复配置热更新时旧模型连接可能被提前关闭的问题。

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Undefined-bot
-Version: 3.6.5
+Version: 3.6.7
 Summary: QQ bot platform with cognitive memory architecture and multi-agent Skills, via OneBot V11.
 Project-URL: Repository, https://github.com/69gg/Undefined
 Project-URL: Issues, https://github.com/69gg/Undefined/issues

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/config.toml.example

@@ -1233,6 +1233,34 @@ auto_extract_group_ids = []
 # en: Private chat allowlist for auto-extraction (empty = follow global access.allowed_private_ids).
 auto_extract_private_ids = []
 
+# zh: 抖音视频自动提取配置。
+# en: Douyin video auto-extraction settings.
+[douyin]
+# zh: 是否让抖音短链解析、share 页、ttid 注册和视频流请求使用 [proxy] 代理地址。默认关闭。
+# en: Whether Douyin short-link, share page, ttid registration, and video stream requests use proxy addresses from [proxy]. Disabled by default.
+use_proxy = false
+# zh: 是否启用自动提取（检测到抖音短链、长链或 aweme_id 时自动下载并发送）。
+# en: Enable auto-extraction (auto-download and send when Douyin short links, long links, or aweme IDs are detected).
+auto_extract_enabled = false
+# zh: 最大视频时长（秒），超过则不下载，仅发送信息卡片。0=不限。
+# en: Max video duration (seconds); exceeding this sends info card only. 0=unlimited.
+max_duration = 600
+# zh: 最大文件大小（MB），超过则仅发送信息卡片。0=不限。
+# en: Max file size (MB); exceeding this sends info card only. 0=unlimited.
+max_file_size = 100
+# zh: 清晰度探测顺序。游客 share 页无 bit_rate 时会按该列表探测 play 端点，并按文件大小去重。
+# en: Quality probing order. Visitor share pages lack bit_rate, so play endpoints are probed in this order and deduplicated by file size.
+prefer_ratios = ["1080p", "720p", "540p", "360p"]
+# zh: 自动提取功能的群聊白名单（空=跟随全局 access.allowed_group_ids）。
+# en: Group allowlist for auto-extraction (empty = follow global access.allowed_group_ids).
+auto_extract_group_ids = []
+# zh: 自动提取功能的私聊白名单（空=跟随全局 access.allowed_private_ids）。
+# en: Private chat allowlist for auto-extraction (empty = follow global access.allowed_private_ids).
+auto_extract_private_ids = []
+# zh: 单条消息最多自动处理几个抖音视频。<=0 回退 3，>10 截断到 10。
+# en: Max number of Douyin videos to auto-process from one message. <=0 falls back to 3, >10 is capped to 10.
+auto_extract_max_items = 3
+
 # zh: arXiv 论文自动提取配置。
 # en: arXiv paper auto-extraction settings.
 [arxiv]
@@ -1559,16 +1587,18 @@ rerank_top_k = 20
 
 # zh: Naga 外部网关集成配置。
 # zh: 开关分层：
-# zh:   - [features].nagaagent_mode_enabled — 总开关，控制 AI 侧行为（提示词切换、工具暴露）
-# zh:   - [naga].enabled — 子开关，控制外部网关集成（回调 API、/naga 命令、绑定管理）
-# zh: 仅当两者均为 true 时，外部网关集成才生效。
+# zh:   - [features].nagaagent_mode_enabled — 进程总闸：是否具备 NagaAgent AI 能力（提示词/工具）
+# zh:   - [naga].enabled — 进程总闸：外部网关集成（回调 API、/naga 命令、绑定管理）
+# zh:   - [naga].mode + 群/私聊名单 — 会话级策略（对齐 [access]）
+# zh: 仅当 AI/网关总闸打开后，才按 mode 名单决定具体群/私聊是否启用。
 # zh: 若只需 NagaAgent 解答能力而不需要外部回调联动，可只开启 nagaagent_mode_enabled。
 # zh: ⚠️ 此功能面向与 NagaAgent 对接的高级场景，普通用户不建议开启。
 # en: Naga external gateway integration settings.
 # en: Switch hierarchy:
-# en:   - [features].nagaagent_mode_enabled — master switch for AI behavior (prompt, tool exposure)
-# en:   - [naga].enabled — sub-switch for external gateway (callback API, /naga command, bindings)
-# en: Both must be true for external gateway integration to work.
+# en:   - [features].nagaagent_mode_enabled — process master: NagaAgent AI capability (prompt/tools)
+# en:   - [naga].enabled — process master: external gateway (callback API, /naga, bindings)
+# en:   - [naga].mode + group/private lists — per-session policy (aligned with [access])
+# en: After masters are on, mode lists decide which group/private sessions are active.
 # en: To get NagaAgent answering without external callbacks, only enable nagaagent_mode_enabled.
 # en: ⚠️ Advanced feature for NagaAgent integration. Not recommended for regular users.
 [naga]
@@ -1591,6 +1621,24 @@ api_key = ""
 # en: Whether to enable Naga outbound message moderation.
 # en: When disabled, /api/v1/naga/messages/send skips local moderation and returns moderation.status=skipped_disabled.
 moderation_enabled = true
-# zh: Naga 白名单群：/naga 在这些群中才可见；绑定和群聊投递也仅限这些群。
-# en: Naga allowlisted groups: /naga is only visible here, and binding/group delivery are restricted to these groups.
-allowed_groups = []
+# zh: Naga 会话级访问控制模式：off / blacklist / allowlist（语义对齐 [access]）。
+# zh: - off: 不按名单过滤；总闸打开后所有群/私聊会话可用
+# zh: - blacklist: 仅拦截 blocked_* 名单
+# zh: - allowlist: 仅放行 allowed_*；某维度列表为空表示该维度全部拒绝（fail closed）
+# en: Naga per-session access mode: off / blacklist / allowlist.
+# en: - off: no list filtering; all sessions allowed when masters are on
+# en: - blacklist: block blocked_* only
+# en: - allowlist: allow allowed_* only; empty list for a dimension denies all (fail closed)
+mode = "off"
+# zh: 群号白名单（allowlist 模式生效；留空 = 拒绝全部群）。
+# en: Allowed group IDs (allowlist mode; empty = deny all groups).
+allowed_group_ids = []
+# zh: 群号黑名单（blacklist 模式生效）。
+# en: Blocked group IDs (blacklist mode).
+blocked_group_ids = []
+# zh: 私聊 QQ 白名单（allowlist 模式生效；留空 = 拒绝全部私聊）。
+# en: Allowed private-chat user IDs (allowlist mode; empty = deny all private chats).
+allowed_private_ids = []
+# zh: 私聊 QQ 黑名单（blacklist 模式生效）。
+# en: Blocked private-chat user IDs (blacklist mode).
+blocked_private_ids = []

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Undefined-bot"
-version = "3.6.5"
+version = "3.6.7"
 description = "QQ bot platform with cognitive memory architecture and multi-agent Skills, via OneBot V11."
 readme = "README.md"
 authors = [

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/src/Undefined/__init__.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
     from .skills.registry import BaseRegistry as BaseRegistry
     from .skills.tools import ToolRegistry as ToolRegistry
 
-__version__: str = "3.6.5"
+__version__: str = "3.6.7"
 
 # symbol -> (module_path, attribute_name)；首次访问时才 importlib 加载
 _LAZY_IMPORTS: dict[str, tuple[str, str]] = {

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/src/Undefined/ai/client/ask_loop.py

@@ -129,16 +129,58 @@ class ClientAskLoopMixin(ClientQueueMixin):
             )
 
         # ===== 阶段二：构建 LLM messages 与 OpenAI tools schema =====
+        # 提示词与工具过滤共用 pre_context（RequestContext + extra_context 合并结果）
         await emit_webchat_stage("building_context")
         messages = await self._prompt_builder.build_messages(
             question,
             get_recent_messages_callback=get_recent_messages_callback,
-            extra_context=extra_context,
+            extra_context=pre_context if pre_context else extra_context,
         )
         await emit_webchat_stage("context_ready")
 
         tools = self.tool_manager.get_openai_tools()
-        tools = self._filter_tools_for_runtime_config(tools)
+        # 有活跃 RequestContext 时以其身份为准，避免 extra_context 覆盖策略会话
+        _session_group_id: int | None = None
+        _session_user_id: int | None = None
+        _session_request_type: str | None = None
+        if ctx is not None:
+            if ctx.group_id is not None:
+                try:
+                    _session_group_id = int(ctx.group_id)
+                except (TypeError, ValueError):
+                    _session_group_id = None
+            raw_uid = ctx.user_id if ctx.user_id is not None else ctx.sender_id
+            if raw_uid is not None:
+                try:
+                    _session_user_id = int(raw_uid)
+                except (TypeError, ValueError):
+                    _session_user_id = None
+            if ctx.request_type is not None:
+                _session_request_type = str(ctx.request_type) or None
+        else:
+            raw_gid = pre_context.get("group_id")
+            raw_uid = pre_context.get("user_id")
+            if raw_uid is None:
+                raw_uid = pre_context.get("sender_id")
+            raw_rtype = pre_context.get("request_type")
+            if raw_gid is not None:
+                try:
+                    _session_group_id = int(raw_gid)
+                except (TypeError, ValueError):
+                    _session_group_id = None
+            if raw_uid is not None:
+                try:
+                    _session_user_id = int(raw_uid)
+                except (TypeError, ValueError):
+                    _session_user_id = None
+            if raw_rtype is not None:
+                _session_request_type = str(raw_rtype) or None
+        tools = self._filter_tools_for_runtime_config(
+            tools,
+            group_id=_session_group_id,
+            user_id=_session_user_id,
+            request_type=_session_request_type,
+        )
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug(
                 "[AI消息] 构建完成: messages=%s tools=%s question_len=%s",

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/src/Undefined/ai/client/setup.py

@@ -665,10 +665,40 @@ class ClientSetupMixin:
         return list(runtime_config.prefetch_tools)
 
     def _filter_tools_for_runtime_config(
-        self, tools: list[dict[str, Any]]
+        self,
+        tools: list[dict[str, Any]],
+        *,
+        group_id: int | None = None,
+        user_id: int | None = None,
+        request_type: str | None = None,
     ) -> list[dict[str, Any]]:
         runtime_config = self._get_runtime_config()
-        enabled = bool(getattr(runtime_config, "nagaagent_mode_enabled", False))
+        from Undefined.config.naga_policy import resolve_naga_session_allowed
+        from Undefined.context import RequestContext
+
+        # 未显式传入会话信息时，回退到 RequestContext（覆盖 request_model 等路径）
+        if group_id is None and user_id is None and request_type is None:
+            ctx = RequestContext.current()
+            if ctx is not None:
+                request_type = str(ctx.request_type or "") or None
+                if ctx.group_id is not None:
+                    try:
+                        group_id = int(ctx.group_id)
+                    except (TypeError, ValueError):
+                        group_id = None
+                uid = ctx.user_id if ctx.user_id is not None else ctx.sender_id
+                if uid is not None:
+                    try:
+                        user_id = int(uid)
+                    except (TypeError, ValueError):
+                        user_id = None
+
+        enabled = resolve_naga_session_allowed(
+            runtime_config,
+            request_type=request_type,
+            group_id=group_id,
+            user_id=user_id,
+        )
         if enabled:
             return tools
 

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/src/Undefined/ai/prompts/builder.py

@@ -125,10 +125,74 @@ class PromptBuilder:
         except Exception:
             return ""
 
-    async def _load_system_prompt(self) -> str:
+    def _resolve_session_scope(
+        self, extra_context: dict[str, Any] | None
+    ) -> tuple[str | None, int | None, int | None]:
+        """从 RequestContext / extra_context 解析 request_type, group_id, user_id。"""
+        request_type: str | None = None
+        group_id: int | None = None
+        user_id: int | None = None
+
+        ctx = RequestContext.current()
+        if ctx is not None:
+            request_type = str(ctx.request_type or "") or None
+            if ctx.group_id is not None:
+                group_id = int(ctx.group_id)
+            if ctx.user_id is not None:
+                user_id = int(ctx.user_id)
+            elif ctx.sender_id is not None and group_id is None:
+                user_id = int(ctx.sender_id)
+
+        # RequestContext 已给出的字段不可被 extra_context 覆盖；仅补齐缺失项
+        if isinstance(extra_context, dict):
+            if request_type is None and extra_context.get("request_type") is not None:
+                request_type = str(extra_context.get("request_type") or "") or None
+            if group_id is None and extra_context.get("group_id") is not None:
+                try:
+                    group_id = int(extra_context["group_id"])
+                except (TypeError, ValueError):
+                    pass
+            if user_id is None and extra_context.get("user_id") is not None:
+                try:
+                    user_id = int(extra_context["user_id"])
+                except (TypeError, ValueError):
+                    pass
+            elif (
+                user_id is None
+                and extra_context.get("sender_id") is not None
+                and group_id is None
+            ):
+                try:
+                    user_id = int(extra_context["sender_id"])
+                except (TypeError, ValueError):
+                    pass
+
+        return request_type, group_id, user_id
+
+    def _resolve_nagaagent_active(self, extra_context: dict[str, Any] | None) -> bool:
+        if self._runtime_config_getter is None:
+            return False
+        try:
+            runtime_config = self._runtime_config_getter()
+        except Exception:
+            return False
+        if runtime_config is None:
+            return False
+        from Undefined.config.naga_policy import resolve_naga_session_allowed
+
+        request_type, group_id, user_id = self._resolve_session_scope(extra_context)
+        return resolve_naga_session_allowed(
+            runtime_config,
+            request_type=request_type,
+            group_id=group_id,
+            user_id=user_id,
+        )
+
+    async def _load_system_prompt(self, *, nagaagent_active: bool | None = None) -> str:
         system_prompt_path = select_system_prompt_path(
             default_path=self._system_prompt_path,
             runtime_config_getter=self._runtime_config_getter,
+            nagaagent_active=nagaagent_active,
         )
         try:
             return read_text_resource(system_prompt_path)
@@ -185,14 +249,19 @@ class PromptBuilder:
                 payload["detail"] = detail
             await webchat_event_callback("stage", payload)
 
-        system_prompt = await self._load_system_prompt()
+        nagaagent_active = self._resolve_nagaagent_active(extra_context)
+        system_prompt = await self._load_system_prompt(
+            nagaagent_active=nagaagent_active
+        )
         logger.debug(
-            "[Prompt] system_prompt_len=%s path=%s",
+            "[Prompt] system_prompt_len=%s path=%s nagaagent_active=%s",
             len(system_prompt),
             select_system_prompt_path(
                 default_path=self._system_prompt_path,
                 runtime_config_getter=self._runtime_config_getter,
+                nagaagent_active=nagaagent_active,
             ),
+            nagaagent_active,
         )
 
         if self._bot_qq != 0:

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/src/Undefined/ai/prompts/system_context.py

@@ -17,18 +17,33 @@ def select_system_prompt_path(
     *,
     default_path: str,
     runtime_config_getter: Any | None,
+    nagaagent_active: bool | None = None,
+    group_id: int | None = None,
+    user_id: int | None = None,
+    request_type: str | None = None,
 ) -> str:
-    """根据运行时配置选择系统提示词路径。"""
-    if runtime_config_getter is None:
-        return default_path
-
-    runtime_config = None
-    try:
-        runtime_config = runtime_config_getter()
-    except Exception:
+    """根据运行时配置与会话策略选择系统提示词路径。"""
+    if nagaagent_active is not None:
+        enabled = bool(nagaagent_active)
+    elif runtime_config_getter is None:
+        enabled = False
+    else:
         runtime_config = None
+        try:
+            runtime_config = runtime_config_getter()
+        except Exception:
+            runtime_config = None
+        if runtime_config is None:
+            enabled = False
+        else:
+            from Undefined.config.naga_policy import resolve_naga_session_allowed
 
-    enabled = bool(getattr(runtime_config, "nagaagent_mode_enabled", False))
+            enabled = resolve_naga_session_allowed(
+                runtime_config,
+                request_type=request_type,
+                group_id=group_id,
+                user_id=user_id,
+            )
     # NagaAgent 模式切换专用系统提示词模板
     if enabled:
         return "res/prompts/undefined_nagaagent.xml"

{undefined_bot-3.6.5 → undefined_bot-3.6.7}/src/Undefined/ai/tooling.py

@@ -187,30 +187,51 @@ class ToolManager:
         """
         start_time = time.perf_counter()
 
-        runtime_config = context.get("runtime_config")
-        if runtime_config is not None:
-            nagaagent_mode_enabled = bool(
-                getattr(runtime_config, "nagaagent_mode_enabled", False)
-            )
-            if (
-                not nagaagent_mode_enabled
-                and function_name == "naga_code_analysis_agent"
-            ):
-                return "该功能未启用"
-
-        # 自动注入 RequestContext 资源
+        # 先注入 RequestContext，再做会话级策略判定（避免缺 group_id/user_id）
+        # 身份字段以活跃 RequestContext 为准（覆盖 context 中可能被污染的值）
         ctx = RequestContext.current()
         if ctx:
             for key, value in ctx.get_resources().items():
                 context.setdefault(key, value)
             if ctx.group_id is not None:
-                context.setdefault("group_id", ctx.group_id)
+                context["group_id"] = ctx.group_id
             if ctx.user_id is not None:
-                context.setdefault("user_id", ctx.user_id)
+                context["user_id"] = ctx.user_id
             if ctx.sender_id is not None:
-                context.setdefault("sender_id", ctx.sender_id)
-            context.setdefault("request_type", ctx.request_type)
-            context.setdefault("request_id", ctx.request_id)
+                context["sender_id"] = ctx.sender_id
+            context["request_type"] = ctx.request_type
+            context["request_id"] = ctx.request_id
+
+        runtime_config = context.get("runtime_config")
+        if runtime_config is not None and function_name == "naga_code_analysis_agent":
+            from Undefined.config.naga_policy import resolve_naga_session_allowed
+
+            group_id_raw = context.get("group_id")
+            user_id_raw = context.get("user_id")
+            if user_id_raw is None:
+                user_id_raw = context.get("sender_id")
+            request_type_raw = context.get("request_type")
+            group_id: int | None = None
+            user_id: int | None = None
+            if group_id_raw is not None:
+                try:
+                    group_id = int(group_id_raw)
+                except (TypeError, ValueError):
+                    group_id = None
+            if user_id_raw is not None:
+                try:
+                    user_id = int(user_id_raw)
+                except (TypeError, ValueError):
+                    user_id = None
+            if not resolve_naga_session_allowed(
+                runtime_config,
+                request_type=str(request_type_raw)
+                if request_type_raw is not None
+                else None,
+                group_id=group_id,
+                user_id=user_id,
+            ):
+                return "该功能未启用"
 
         context.setdefault("get_scope_from_context", scope_from_context)
         context.setdefault("download_cache_dir", DOWNLOAD_CACHE_DIR)