@bangdao-ai/zentao-mcp 2.0.2 → 2.0.4

package/.env.example

@@ -1,11 +1,7 @@
-# ═══════════════ MCP 通用 ═══════════════
-ZENTAO_BASE_URL=https://zentao.example.com
-ZENTAO_PRODUCT_ID=365
-ZENTAO_OPENED_BY=your_account
-ZENTAO_KEY=your_api_key
-ZENTAO_USE_TEST_ENV=false
 
-# ═══════════════ ZenBot 专属 ═══════════════
+
+# ═══════════════ ZenBot 部署必填 ═══════════════
+
 # 钉钉应用
 DINGTALK_APP_KEY=your_app_key
 DINGTALK_APP_SECRET=your_app_secret
@@ -14,8 +10,9 @@ DINGTALK_APP_SECRET=your_app_secret
 OPENAI_API_KEY=your_openai_api_key
 OPENAI_BASE_URL=https://dashscope.aliyuncs.com/compatible-mode/v1
 LLM_MODEL=qwen-plus
+LLM_VISION_MODEL=qwen-vl-plus
 
-# 禅道 MySQL（用于用户/产品自动映射）
+# 禅道 MySQL（用户工号→禅道账号自动映射）
 MYSQL_ZENTAO_HOST=127.0.0.1
 MYSQL_ZENTAO_PORT=3306
 MYSQL_ZENTAO_USER=root

package/README.md

@@ -159,18 +159,24 @@
 
 ```
 zentao-mcp/
-├── index.js              # Node.js 入口（自动检测Python、安装依赖）
+├── index.js                  # Node.js 入口（自动检测Python、安装依赖）
+├── main.py                   # 钉钉机器人入口
 ├── src/
-│   ├── mcp_server.py     # MCP 服务器（36 工具注册和路由）
-│   ├── zentao_nexus.py   # 禅道原生API客户端 + 业务层
-│   └── bug_classifier.py # Bug 智能分类引擎
+│   ├── core/
+│   │   ├── zentao_nexus.py   # 禅道原生API客户端 + 业务层
+│   │   └── bug_classifier.py # Bug 智能分类引擎
+│   ├── mcp/
+│   │   └── server.py         # MCP 服务器（工具注册和路由）
+│   └── zenbot/               # 钉钉机器人模块
+│       ├── bot_service.py    # 意图路由 & handler 调度
+│       ├── handlers/         # 各领域 handler
+│       └── ...
 ├── testing/
-│   ├── test_zentao_api.py   # Pytest 全能力测试（40 条，严格断言）
-│   ├── TEST_README.md       # 测试说明
-│   └── mcp.json             # 测试环境配置
+│   ├── test_zentao_api.py    # Pytest 全能力测试
+│   └── mcp.json              # 测试环境配置
 ├── docs/
-│   ├── zentao-native-api.md # 原生 API 文档
-│   └── RELEASE.md           # 发布说明
+│   ├── zentao-native-api.md  # 原生 API 文档
+│   └── RELEASE.md            # 发布说明
 ├── package.json
 ├── requirements.txt
 └── README.md
@@ -181,9 +187,9 @@ zentao-mcp/
 ```
 AI 编辑器 (Cursor/Claude)
     ↕ MCP 协议 (stdio)
-MCP Server (mcp_server.py)
-    ↕ 36 Tool 定义 & 路由
-ZenTaoNexus (zentao_nexus.py) — 业务封装层
+MCP Server (src/mcp/server.py)
+    ↕ Tool 定义 & 路由
+ZenTaoNexus (src/core/zentao_nexus.py) — 业务封装层
     ↕
 ZenTaoNativeClient — 原生 API 客户端
     ↕ HTTP POST (api.php?m=module&f=action)

package/index.js

@@ -243,10 +243,10 @@ function main() {
     console.error('\n故障排查：');
     console.error('1. 检查 Python 是否安装: python3 --version');
     if (isWindows) {
-      console.error('2. 检查脚本是否存在: dir src\\mcp_server.py');
+      console.error('2. 检查脚本是否存在: dir src\\mcp\\server.py');
       console.error('3. 检查依赖是否安装: pip3 list | findstr mcp');
     } else {
-      console.error('2. 检查脚本是否存在: ls -la src/mcp_server.py');
+      console.error('2. 检查脚本是否存在: ls -la src/mcp/server.py');
       console.error('3. 检查依赖是否安装: pip3 list | grep mcp');
     }
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bangdao-ai/zentao-mcp",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "禅道项目管理AI中枢 v2.0 — 35+MCP工具覆盖需求·任务·Bug·用例·发布·我的地盘全生命周期，原生API模式，Bug智能分类引擎+CSV批量用例导入+截图上传，一句话驱动禅道",
   "main": "index.js",
   "bin": {

package/src/core/zentao_nexus.py

@@ -583,6 +583,36 @@ class ZenTaoNativeClient:
                             params={'productID': product_id}, form_data=case_data)
         return self.normalize(result)
 
+    def testcase_import_batch(self, product_id, cases: list) -> Dict:
+        """
+        通过禅道 testcase.showImport 批量导入用例。
+
+        与 testcase.create 的区别：
+        - create 的步骤用 steps[1], steps[2]... 逐条，步骤编号由参数下标决定
+        - showImport 的步骤用 stepDesc[N] 整段多行文本，禅道自动解析编号
+
+        Args:
+            product_id: 产品 ID
+            cases: [{title, pri, type, stage, module, story, keywords,
+                     precondition, stepDesc, stepExpect}, ...]
+        """
+        form_data = {}
+        for idx, case in enumerate(cases, 1):
+            form_data[f'title[{idx}]'] = case.get('title', '')
+            form_data[f'module[{idx}]'] = case.get('module', '0')
+            form_data[f'story[{idx}]'] = case.get('story', '')
+            form_data[f'pri[{idx}]'] = case.get('pri', '3')
+            form_data[f'type[{idx}]'] = case.get('type', 'feature')
+            form_data[f'stage[{idx}]'] = case.get('stage', '')
+            form_data[f'keywords[{idx}]'] = case.get('keywords', '')
+            form_data[f'precondition[{idx}]'] = case.get('precondition', '')
+            form_data[f'stepDesc[{idx}]'] = case.get('stepDesc', '')
+            form_data[f'stepExpect[{idx}]'] = case.get('stepExpect', '')
+        result = self._call('testcase', 'showImport',
+                            params={'productID': product_id, 'branch': '0'},
+                            form_data=form_data)
+        return self.normalize(result)
+
     def testcase_create_by_gateway(self, case_data: Dict) -> Dict:
         """
         通过历史稳定网关创建用例（allneedlist/createcasebyapi）。
@@ -757,18 +787,43 @@ class ZenTaoNativeClient:
 
     def file_upload(self, object_type: str, object_id, file_path: str,
                     custom_filename: Optional[str] = None) -> Dict:
+        """
+        上传文件并关联到指定对象。
+        优先使用 allneedlist/uploadbyapi（token 认证兼容），
+        回退到 file/upload（需要 web session 权限，部分环境 401）。
+        """
         file_path = _safe_path(file_path, must_exist=True)
         if not os.path.exists(file_path):
             return {"status": 0, "message": "fail",
                     "info": f"文件不存在: {file_path}", "data": {}}
 
         filename = custom_filename or os.path.basename(file_path)
+        oid = str(object_id)
+
         try:
+            with open(file_path, 'rb') as f:
+                files = {'files[]': (filename, f, 'image/png')}
+                form_data = {'objectType': object_type, 'objectID': oid, 'id': oid}
+                result = self._call('allneedlist', 'uploadbyapi',
+                                    form_data=form_data, files=files)
+                normalized = self.normalize(result)
+                if normalized.get("status") == 1:
+                    return normalized
+
+            gateway_error = normalized
+
             with open(file_path, 'rb') as f:
                 files = {'files[]': (filename, f, 'application/octet-stream')}
-                form_data = {'objectType': object_type, 'objectID': str(object_id)}
-                result = self._call('file', 'upload', form_data=form_data, files=files)
-                return self.normalize(result)
+                result = self._call('file', 'upload',
+                                    params={'objectType': object_type,
+                                            'objectID': oid},
+                                    files=files)
+                normalized = self.normalize(result)
+                if normalized.get("status") == 1:
+                    return normalized
+
+            return gateway_error
+
         except Exception as e:
             return {"status": 0, "message": "fail",
                     "info": f"文件处理失败: {e}", "data": {}}
@@ -794,11 +849,11 @@ class ZenTaoNexus:
         self.product_id = os.getenv("ZENTAO_PRODUCT_ID") or ""
 
         code = code or os.getenv("ZENTAO_OPENED_BY")
-        key = key or os.getenv("ZENTAO_KEY")
+        key = key or os.getenv("ZENTAO_KEY") or os.getenv("KEY")
         if not code:
             raise ValueError("未设置 code 参数或环境变量 ZENTAO_OPENED_BY")
         if not key:
-            raise ValueError("未设置 key 参数或环境变量 ZENTAO_KEY")
+            raise ValueError("未设置 key 参数或环境变量 ZENTAO_KEY / KEY")
 
         self.opened_by = code
         use_test = os.getenv("ZENTAO_USE_TEST_ENV", "").lower() in ('1', 'true', 'yes')
@@ -859,7 +914,7 @@ class ZenTaoNexus:
 
     def create_bug(self, title, steps, product_id=None, opened_by=None,
                    assigned_to=None, screenshot_path=None, **kwargs) -> Dict:
-        from bug_classifier import classify_bug
+        from core.bug_classifier import classify_bug
 
         product_id = product_id or self.product_id
         opened_by = opened_by or self.opened_by
@@ -1359,90 +1414,169 @@ class ZenTaoNexus:
             "gateway_error": gateway_result,
         }
 
+    @staticmethod
+    def _build_numbered_text(lines: list) -> str:
+        """将步骤/预期列表组装为带编号的多行文本（供 showImport 接口使用）。"""
+        if not lines:
+            return ''
+        return '\n'.join(f"{i}. {ln}" for i, ln in enumerate(lines, 1))
+
+    @staticmethod
+    def _split_numbered_lines(text: str) -> list:
+        """将多行编号文本拆分为独立条目，去掉编号前缀。"""
+        if not text or not text.strip():
+            return []
+        lines = [ln.strip() for ln in text.strip().splitlines() if ln.strip()]
+        result = []
+        for ln in lines:
+            cleaned = re.sub(r'^(\d+)\s*[.、)]\s*', '', ln)
+            cleaned = re.sub(r'^[-–—]\s*', '', cleaned)
+            if cleaned:
+                result.append(cleaned)
+        return result if result else [text.strip()]
+
+    def _parse_csv_rows(self, csv_file_path, case_type=None):
+        """解析 CSV 文件，返回 (fieldnames, rows, case_type)。
+
+        支持两种 CSV 格式：
+        - 富格式（含 步骤/预期 列）：用例标题, 步骤, 预期, 前置条件, 优先级, 关键词
+        - 接口格式（含 接口地址/请求方法 列）：用例名称, 接口地址, 请求方法, 请求体, 断言, 预期结果
+        - 简易格式：用例名称, 预期结果
+        """
+        with open(csv_file_path, 'r', encoding='utf-8', newline='') as f:
+            reader = csv.DictReader(f)
+            fieldnames = list(reader.fieldnames or [])
+
+            if case_type is None:
+                if '接口地址' in fieldnames and '请求方法' in fieldnames:
+                    case_type = "interface"
+                else:
+                    case_type = "feature"
+            elif case_type == "接口测试":
+                case_type = "interface"
+            elif case_type == "功能测试":
+                case_type = "feature"
+
+            rows = list(reader)
+        return fieldnames, rows, case_type
+
     def create_case_from_csv(self, csv_file_path, case_type=None) -> list:
         csv_file_path = _safe_path(csv_file_path, must_exist=True)
         if not os.path.exists(csv_file_path):
             return [{"status": 0, "message": f"CSV文件不存在: {csv_file_path}"}]
 
-        current_time = datetime.now()
-        time_str = current_time.strftime("%H:%M:%S")
-        results = []
-        updated_rows = []
+        time_str = datetime.now().strftime("%H:%M:%S")
 
         try:
-            with open(csv_file_path, 'r', encoding='utf-8', newline='') as f:
-                reader = csv.DictReader(f)
-                fieldnames = reader.fieldnames
+            fieldnames, rows, case_type = self._parse_csv_rows(csv_file_path, case_type)
+        except Exception as e:
+            return [{"status": 0, "message": f"读取CSV文件失败: {e}"}]
 
-                if case_type is None:
-                    if '接口地址' in fieldnames and '请求方法' in fieldnames:
-                        case_type = "interface"
-                    else:
-                        case_type = "feature"
-                elif case_type == "接口测试":
-                    case_type = "interface"
-                elif case_type == "功能测试":
-                    case_type = "feature"
+        has_rich_steps = '步骤' in fieldnames and '预期' in fieldnames
+        title_col = '用例标题' if '用例标题' in fieldnames else '用例名称'
 
-                for row in reader:
-                    if not row.get('用例名称'):
-                        row['用例ID'] = ''
-                        updated_rows.append(row)
-                        continue
+        batch_cases = []
+        valid_row_indices = []
 
-                    case_data = {
-                        "product": self.product_id,
-                        "type": case_type,
-                        "title": row['用例名称'],
-                        "module": "0",
-                        "stage": "intergrate",
-                        "keywords": f"ai {time_str}",
-                        "openedBy": self.opened_by,
-                    }
-
-                    if case_type == "interface":
-                        interface_url = row.get('接口地址', '')
-                        request_method = row.get('请求方法', 'POST')
-                        request_body = row.get('请求体', '')
-                        assertion = row.get('断言', '')
-                        expected_result = row.get('预期结果', '')
-
-                        steps = ["准备测试数据", f"发送请求体：{request_body}",
-                                 f"调用接口 {interface_url}", "验证响应结果"]
-                        expects = ["测试数据准备完成", f"请求体格式正确：{request_body}",
-                                   f"接口调用成功，方法：{request_method}",
-                                   f"断言验证：{assertion}\\n预期结果：{expected_result}"]
-                        case_data["precondition"] = f"前置条件：\\n1. 系统已启动\\n2. 接口服务正常运行\\n3. 接口地址：{interface_url}\\n4. 请求方法：{request_method}"
-                    else:
-                        steps = ["打开系统页面", "执行相关操作", "验证功能结果"]
-                        expects = ["系统页面正常打开", "操作执行成功",
-                                   row.get('预期结果', '功能符合预期')]
-                        case_data["precondition"] = "前置条件：\\n1. 系统已启动\\n2. 用户已登录"
-
-                    for i, step in enumerate(steps, 1):
-                        case_data[f"steps[{i}]"] = step
-                    for i, expect in enumerate(expects, 1):
-                        case_data[f"expects[{i}]"] = expect
-
-                    result = self.create_case(case_data)
-                    result['case_name'] = row['用例名称']
-                    results.append(result)
-
-                    if result.get('status') == 1:
-                        row['用例ID'] = result.get('data', {}).get('id', result.get('info', ''))
-                    else:
-                        row['用例ID'] = f"创建失败: {result.get('info', '未知错误')}"
-                    updated_rows.append(row)
+        for idx, row in enumerate(rows):
+            title = (row.get(title_col) or '').strip()
+            if not title:
+                continue
 
-            if '用例ID' not in fieldnames:
-                fieldnames.append('用例ID')
+            kw = (row.get('关键词') or '').strip()
+            pri = (row.get('优先级') or '').strip()
+
+            case = {
+                'title': title,
+                'module': '0',
+                'story': '',
+                'pri': pri if pri in ('1', '2', '3', '4') else '3',
+                'type': case_type,
+                'stage': '',
+                'keywords': f"{kw} {time_str}" if kw else f"ai {time_str}",
+            }
+
+            if has_rich_steps:
+                raw_steps = row.get('步骤', '')
+                raw_expects = row.get('预期', '')
+                case['stepDesc'] = raw_steps.strip()
+                case['stepExpect'] = raw_expects.strip()
+                precond = (row.get('前置条件') or '').strip()
+                case['precondition'] = precond if precond else ''
+            elif case_type == "interface":
+                interface_url = row.get('接口地址', '')
+                request_method = row.get('请求方法', 'POST')
+                request_body = row.get('请求体', '')
+                assertion = row.get('断言', '')
+                expected_result = row.get('预期结果', '')
+                steps = ["准备测试数据", f"发送请求体：{request_body}",
+                         f"调用接口 {interface_url}", "验证响应结果"]
+                expects = ["测试数据准备完成", f"请求体格式正确：{request_body}",
+                           f"接口调用成功，方法：{request_method}",
+                           f"断言验证：{assertion}，预期结果：{expected_result}"]
+                case['stepDesc'] = self._build_numbered_text(steps)
+                case['stepExpect'] = self._build_numbered_text(expects)
+                case['precondition'] = (
+                    f"1. 系统已启动\n2. 接口服务正常运行"
+                    f"\n3. 接口地址：{interface_url}\n4. 请求方法：{request_method}"
+                )
+            else:
+                steps = ["打开系统页面", "执行相关操作", "验证功能结果"]
+                expects = ["系统页面正常打开", "操作执行成功",
+                           row.get('预期结果', '功能符合预期')]
+                case['stepDesc'] = self._build_numbered_text(steps)
+                case['stepExpect'] = self._build_numbered_text(expects)
+                case['precondition'] = "1. 系统已启动\n2. 用户已登录"
+
+            batch_cases.append(case)
+            valid_row_indices.append(idx)
+
+        if not batch_cases:
+            return [{"status": 0, "message": "CSV 中无有效用例行"}]
+
+        result = self.client.testcase_import_batch(self.product_id, batch_cases)
+        ok = result.get('status') == 1
+
+        if ok:
+            latest = self.client.testcase_browse(
+                self.product_id, orderBy='id_desc',
+                recPerPage=str(len(batch_cases) + 5))
+            latest_cases = latest.get("data", {}).get("cases", [])
+            if isinstance(latest_cases, dict):
+                latest_cases = list(latest_cases.values())
+            title_to_id = {}
+            for c in latest_cases:
+                t = str(c.get('title', '')).strip()
+                cid = str(c.get('id', '')).strip()
+                if t and cid and t not in title_to_id:
+                    title_to_id[t] = cid
+
+        results = []
+        for i, case in enumerate(batch_cases):
+            row_idx = valid_row_indices[i]
+            entry = {'case_name': case['title'], 'status': 1 if ok else 0}
+            if ok:
+                cid = title_to_id.get(case['title'], '')
+                entry['caseID'] = cid
+                rows[row_idx]['用例ID'] = cid
+            else:
+                entry['info'] = result.get('info', result.get('message', '批量导入失败'))
+                rows[row_idx]['用例ID'] = f"失败: {entry['info']}"
+            results.append(entry)
+
+        for idx, row in enumerate(rows):
+            if idx not in valid_row_indices:
+                row.setdefault('用例ID', '')
+
+        if '用例ID' not in fieldnames:
+            fieldnames.append('用例ID')
+        try:
             with open(csv_file_path, 'w', encoding='utf-8', newline='') as f:
                 writer = csv.DictWriter(f, fieldnames=fieldnames)
                 writer.writeheader()
-                writer.writerows(updated_rows)
-
+                writer.writerows(rows)
         except Exception as e:
-            results.append({"status": 0, "message": f"处理CSV文件失败: {e}"})
+            logger.warning("写回CSV失败: %s", e)
 
         return results
 
@@ -1457,10 +1591,10 @@ class ZenTaoNexus:
 
         results = self.create_case_from_csv(csv_file_path, case_type)
         success_count = sum(1 for r in results if r.get('status') == 1)
-        failed_count = len(results) - success_count
+        failed_count = sum(1 for r in results if r.get('status') != 1)
 
         return {
-            "status": "success", "message": "CSV文件测试用例提交完成",
+            "status": "success", "message": "CSV批量导入完成（showImport接口）",
             "total_cases": len(results), "success_count": success_count,
             "failed_count": failed_count,
             "success_rate": (success_count / len(results) * 100) if results else 0.0,
@@ -1474,10 +1608,14 @@ class ZenTaoNexus:
 
     # ─────────── 我的地盘 ───────────
 
+    _MY_BUG_TYPE_MAP = {
+        'assigntome': 'assignedTo',
+        'assignedtome': 'assignedTo',
+    }
+
     def get_my_bug(self, type_='assigntome') -> Dict:
-        if type_ == 'assigntome':
-            return self.client.bug_browse(0, 'assigntome')
-        return self.client.my_bug(type_)
+        api_type = self._MY_BUG_TYPE_MAP.get(type_, type_)
+        return self.client.my_bug(api_type)
 
     def get_my_task(self, type_='assignedtome') -> Dict:
         return self.client.my_task(type_)
@@ -1490,7 +1628,7 @@ class ZenTaoNexus:
 
     def get_my_work(self) -> Dict:
         """获取"我的待办"概览"""
-        bugs = self.client.my_bug('assigntome')
+        bugs = self.client.my_bug('assignedTo')
         tasks = self.client.my_task('assignedtome')
         stories = self.client.my_story('assignedtome')
         todos = self.client.my_todo('all')

package/src/zenbot/bot_service.py

@@ -8,11 +8,14 @@ from .config import build_user_context
 logger = logging.getLogger("zentaoagent")
 audit_logger = logging.getLogger("zentao_audit")
 from .intent_parser import parse_intent, IntentResult
-from .session_manager import get_session, create_session, update_session, clear_session, is_cancel_keyword
-from .session_manager import get_last_bug_ids
+from .session_manager import (
+    get_session, create_session, update_session, clear_session, is_cancel_keyword,
+    get_last_bug_ids, set_last_action, get_last_action,
+)
 from .handlers import HANDLERS
 from .formatters import format_unbound_user, format_unknown, format_error
 from .zentao_client import ZentaoPermissionError
+from . import llm_client
 
 _ALLOWED_INTENTS = frozenset(HANDLERS.keys()) | {"unknown"}
 
@@ -50,6 +53,7 @@ def dispatch(
     session_webhook: str,
     conversation_id: str,
     conversation_type: int,
+    image_paths: list[str] | None = None,
 ) -> str:
     user_context = build_user_context(staff_id, staff_nick, session_webhook, conversation_id, conversation_type)
     if not user_context:
@@ -68,7 +72,9 @@ def dispatch(
     if pending and content.strip().lower() in _CONFIRM_KEYWORDS:
         _pending_confirms.pop(session_key, None)
         logger.info("二次确认通过 intent=%s session=%s", pending.intent, session_key)
-        return _execute_handler(pending, user_context)
+        reply = _execute_handler(pending, user_context)
+        set_last_action(session_key, pending.intent, pending.params, reply)
+        return reply
     elif pending:
         _pending_confirms.pop(session_key, None)
 
@@ -81,11 +87,12 @@ def dispatch(
         )
         merged_params = {**session_state.params, **intent_result.params}
         intent_result.params = merged_params
-        intent_result.missing_params = [p for p in intent_result.missing_params if p not in merged_params]
+        intent_result.missing_params = [p for p in intent_result.missing_params if not merged_params.get(p)]
         if intent_result.intent == "bug_close":
             _fix_bug_close_missing(intent_result, session_key)
         if intent_result.intent == "bug_resolve":
             _fix_bug_resolve_missing(intent_result)
+        _inject_image_paths(intent_result, image_paths)
         if intent_result.missing_params:
             _enrich_product_suggestion(intent_result, user_context)
             if intent_result.intent == "bug_close" and ("bug_id" in intent_result.missing_params or "bug_ids" in intent_result.missing_params):
@@ -103,16 +110,22 @@ def dispatch(
             return _format_missing_params(intent_result.missing_params)
         clear_session(session_key)
     else:
-        intent_result = parse_intent(content, user_context)
+        last_action = get_last_action(session_key)
+        intent_result = parse_intent(content, user_context, last_action=last_action)
 
-    if intent_result.confidence < 0.6 and intent_result.clarify_question:
+    if intent_result.intent != "unknown" and intent_result.confidence < 0.6 and intent_result.clarify_question:
         return intent_result.clarify_question
 
+    if intent_result.intent == "unknown" or intent_result.intent not in HANDLERS:
+        return _handle_general_chat(content, image_paths, user_context)
+
     if intent_result.intent == "bug_close":
         _fix_bug_close_missing(intent_result, session_key)
     if intent_result.intent == "bug_resolve":
         _fix_bug_resolve_missing(intent_result)
 
+    _inject_image_paths(intent_result, image_paths)
+
     if intent_result.missing_params:
         _enrich_product_suggestion(intent_result, user_context)
         if intent_result.intent == "bug_close" and ("bug_id" in intent_result.missing_params or "bug_ids" in intent_result.missing_params):
@@ -139,7 +152,9 @@ def dispatch(
     logger.info("意图解析 intent=%s confidence=%.2f params=%s missing=%s",
                 intent_result.intent, intent_result.confidence,
                 intent_result.params, intent_result.missing_params)
-    return _execute_handler(intent_result, user_context)
+    reply = _execute_handler(intent_result, user_context)
+    set_last_action(session_key, intent_result.intent, intent_result.params, reply)
+    return reply
 
 
 _WRITE_INTENTS = frozenset({
@@ -178,6 +193,16 @@ def _execute_handler(intent_result: IntentResult, user_context) -> str:
         return format_error(str(e))
 
 
+def _inject_image_paths(intent_result: IntentResult, image_paths: list[str] | None) -> None:
+    """当用户通过钉钉直接发图且意图需要文件时，自动注入本地文件路径。"""
+    if not image_paths:
+        return
+    if intent_result.intent == "bug_upload" and not intent_result.params.get("file_path"):
+        intent_result.params["file_path"] = image_paths[0]
+        intent_result.missing_params = [p for p in intent_result.missing_params if p != "file_path"]
+        logger.info("自动注入图片路径 file_path=%s", image_paths[0])
+
+
 def _fix_bug_resolve_missing(intent_result: IntentResult) -> None:
     """resolution 默认 fixed，不追问用户"""
     if "resolution" in intent_result.missing_params:
@@ -246,3 +271,22 @@ def _format_missing_params(missing_params: list) -> str:
         lines.append(f"{i}️⃣ {name}是什么？")
     lines.append("\n直接告诉我就行，比如「登录报错，指派给张三」")
     return "\n".join(lines)
+
+
+def _handle_general_chat(content: str, image_paths: list[str] | None, user_context) -> str:
+    """非禅道意图 → 千问通用问答（含图片分析），失败时回退到 format_unknown"""
+    try:
+        from .intent_parser import _load_soul
+        soul = _load_soul()
+        reply = llm_client.general_chat(
+            content,
+            image_paths=image_paths,
+            user_name=user_context.zentao_name,
+            soul_content=soul,
+        )
+        if reply:
+            logger.info("通用问答回复 user=%s reply=%s", user_context.zentao_code, reply[:100])
+            return reply
+    except Exception:
+        logger.exception("通用问答异常")
+    return format_unknown()