fix: 加宽 skill_trajectory_links.atom_id 列 VARCHAR(36)->128 修复 DataError(1406)；TraceIdFilter 从 root logger 移至 handler 修复子 logger %(trace_id)s KeyError 日志刷屏；evolution scheduler 循环增加 db.rollback() 兜底；附带 models.py CRLF->LF 归一。

backend/python/app/api/chat_media.py

@@ -1430,7 +1430,7 @@ async def _generate_media_task(ai_msg_id: str, ai_model_id: str, prompt: str, us
         logger.info(f"[_generate_media_task] 启动 media 生成 msg={ai_msg_id} model={ai_model_id} prompt={prompt[:60]!r}")
         caps = [c.lower() for c in (ai_model.capabilities or [])]
         is_video = "video" in caps
-        timeout_seconds = 300 if is_video else 90
+        timeout_seconds = 300 if is_video else 180
         try:
             result = await asyncio.wait_for(
                 _generate_media(db, ai_model, prompt, user_id),

backend/python/app/api/chat_service.py

@@ -1657,6 +1657,16 @@ async def _send_message_core(
 
 
 
+    # 媒体分支直接返回，不会进入 LLM 工具调用；提前初始化避免未绑定
+
+    called_skill_names = []
+
+
+
+    called_mcp_names = []
+
+
+
     if effective_skill_ids:
 
 

backend/python/app/config.py

@@ -128,7 +128,15 @@ def setup_file_logging():
     root_logger.setLevel(logging.INFO)
     root_logger.addHandler(app_handler)
     root_logger.addHandler(error_handler)
-    root_logger.addFilter(TraceIdFilter())
+
+    # TraceIdFilter 必须挂在 handler 上，而非 root logger。
+    # logger 级 filter 只对「直接经该 logger 发射」的记录生效；子 logger 的记录向上冒泡
+    # 到 root 的 handler 时不会经过 root 的 logger 级 filter，导致 %(trace_id)s 缺失并抛
+    # KeyError('trace_id')。handler 级 filter 对经它格式化的每条记录都生效。
+    _tid_filter = TraceIdFilter()
+    app_handler.addFilter(_tid_filter)
+    error_handler.addFilter(_tid_filter)
+    access_handler.addFilter(_tid_filter)
 
     # 配置访问日志专用logger
     access_logger = logging.getLogger("aiflow.access")

backend/python/app/models.py

@@ -945,7 +945,7 @@ class SkillTrajectoryLink(Base):
     skill_name = Column(String(200), nullable=False, index=True, comment="关联的技能名称")
     user_id = Column(String(36), ForeignKey("users.id"), nullable=False, index=True)
     trajectory_id = Column(String(36), nullable=True, comment="关联的轨迹ID")
-    atom_id = Column(String(36), nullable=True, comment="原子任务ID")
+    atom_id = Column(String(128), nullable=True, comment="原子任务ID(形如 trajectory_id_atom_N，需容纳 UUID+后缀)")
     weightscore = Column(Integer, default=0, comment="关联权重分")
     created_at = Column(DateTime, default=datetime.now)
 

backend/python/app/services/evolution_service.py

@@ -96,10 +96,24 @@ class PipelineScheduler:
                             self._process_trajectory(db, traj)
                         except Exception as e:
                             logger.error(f"处理轨迹 {traj.id} 失败: {e}")
-                            traj.error_msg = str(e)[:500]
+                            # 先回滚失效事务（_process_trajectory 内 commit 失败会让 session
-                            traj.retry_count = (traj.retry_count or 0) + 1
+                            # 进入 rolled-back 状态，不回滚直接再 commit 会抛 PendingRollbackError
-                            traj.status = "error"
+                            # 并级联到外层日志），再写错误状态。
-                            db.commit()
+                            try:
+                                db.rollback()
+                            except Exception:
+                                pass
+                            try:
+                                traj.error_msg = str(e)[:500]
+                                traj.retry_count = (traj.retry_count or 0) + 1
+                                traj.status = "error"
+                                db.commit()
+                            except Exception as ce:
+                                logger.error(f"更新轨迹 {traj.id} 错误状态失败: {ce}")
+                                try:
+                                    db.rollback()
+                                except Exception:
+                                    pass
                 finally:
                     db.close()
             except Exception as e:

frontend/src/pages/front/ChatPage.css

@@ -471,10 +471,15 @@
 }
 
 .md-table td {
-  padding: 10px 14px;
+  padding: 8px 12px;
   border-bottom: 1px solid #EEF0F4;
   color: var(--color-text-primary);
   vertical-align: top;
+  line-height: 1.5;
+}
+
+.md-table td br {
+  line-height: 0.8;
 }
 
 .md-table tbody tr:last-child td {

frontend/src/pages/front/ChatPage.tsx

@@ -189,41 +189,8 @@ const MarkdownContent: React.FC<{ content: string }> = ({ content }) => {
       return '\x00MEDIA' + (mediaBlocks.length - 1) + '\x00';
     });
 
-    // 2.7 Extract Markdown tables: | h1 | h2 |\n|---|---| ... |
+    // 2.6 Normalize excessive blank lines in prose (code blocks already extracted)
-    // 把整段表格替换为占位符，表格内容(已转义)放入 tableBlocks 数组
+    text = text.replace(/\n{3,}/g, '\n\n').trim();
-    const tableBlocks: string[] = [];
-    text = text.replace(
-      /((?:^\|.+\|\r?\n)+^\|[\s\-:|]+\|\r?\n(?:^\|.+\|\r?\n?)+)/gm,
-      (_m: string, block: string) => {
-        const lines = block.trim().split(/\r?\n/).filter((l: string) => l.trim());
-        if (lines.length < 2) return block;
-        const headerCells = lines[0].split('|').slice(1, -1).map((c: string) => c.trim());
-        const alignCells = lines[1].split('|').slice(1, -1).map((c: string) => {
-          const t = c.trim();
-          const left = t.startsWith(':');
-          const right = t.endsWith(':');
-          if (left && right) return 'center';
-          if (right) return 'right';
-          if (left) return 'left';
-          return 'left';
-        });
-        const bodyRows = lines.slice(2).map((row: string) =>
-          row.split('|').slice(1, -1).map((c: string) => c.trim())
-        );
-        const thead = headerCells.map((c: string, i: number) =>
-          `<th style="text-align:${alignCells[i] || 'left'}">${c}</th>`
-        ).join('');
-        const tbody = bodyRows.map((r: string[]) =>
-          '<tr>' + r.map((c: string, i: number) =>
-            `<td style="text-align:${alignCells[i] || 'left'}">${c}</td>`
-          ).join('') + '</tr>'
-        ).join('');
-        const html = `<table class="md-table"><thead><tr>${thead}</tr></thead><tbody>${tbody}</tbody></table>`;
-        const idx = tableBlocks.length;
-        tableBlocks.push(html);
-        return '\x00TABLE' + idx + '\x00';
-      }
-    );
 
     // 2.8 LaTeX 数学公式：$$...$$（块级）和 $...$（行内）
     // 提取为占位符，渲染后用 KaTeX 处理
@@ -273,15 +240,58 @@ const MarkdownContent: React.FC<{ content: string }> = ({ content }) => {
     text = text.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>');
     text = text.replace(/(?<!\w)\*(?!\*)(.+?)(?<!\*)\*(?!\w)/g, '<em>$1</em>');
 
+    // 7.5 Extract Markdown tables after inline formatting so cells support bold/italic/links.
+    // 表格提取放在加粗/链接之后，避免单元格内 **xxx** 原样显示；同时压缩单元格内多余 <br>。
+    const tableBlocks: string[] = [];
+    text = text.replace(
+      /((?:^\|.+\|\r?\n)+^\|[\s\-:|]+\|\r?\n(?:^\|.+\|\r?\n?)+)/gm,
+      (_m: string, block: string) => {
+        const lines = block.trim().split(/\r?\n/).filter((l: string) => l.trim());
+        if (lines.length < 2) return block;
+        const headerCells = lines[0].split('|').slice(1, -1).map((c: string) => c.trim());
+        const alignCells = lines[1].split('|').slice(1, -1).map((c: string) => {
+          const t = c.trim();
+          const left = t.startsWith(':');
+          const right = t.endsWith(':');
+          if (left && right) return 'center';
+          if (right) return 'right';
+          if (left) return 'left';
+          return 'left';
+        });
+        const normalizeCell = (cell: string) => {
+          return cell
+            .replace(/<br\s*\/?>\s*/gi, '<br/>')
+            .replace(/\n/g, '<br/>')
+            .replace(/(<br\/>){2,}/g, '<br/>')
+            .replace(/^(<br\/>)+|(<br\/>)+$/g, '');
+        };
+        const bodyRows = lines.slice(2).map((row: string) =>
+          row.split('|').slice(1, -1).map((c: string) => normalizeCell(c.trim()))
+        );
+        const thead = headerCells.map((c: string, i: number) =>
+          `<th style="text-align:${alignCells[i] || 'left'}">${normalizeCell(c)}</th>`
+        ).join('');
+        const tbody = bodyRows.map((r: string[]) =>
+          '<tr>' + r.map((c: string, i: number) =>
+            `<td style="text-align:${alignCells[i] || 'left'}">${c}</td>`
+          ).join('') + '</tr>'
+        ).join('');
+        const html = `<table class="md-table"><thead><tr>${thead}</tr></thead><tbody>${tbody}</tbody></table>`;
+        const idx = tableBlocks.length;
+        tableBlocks.push(html);
+        return '\x00TABLE' + idx + '\x00';
+      }
+    );
+
     // 8. Lists
     text = text.replace(/^\s*[-*] (.+)$/gm, '<li class="md-li">$1</li>');
     text = text.replace(/^\s*\d+\. (.+)$/gm, '<li class="md-li">$1</li>');
     // Wrap consecutive <li> in <ul>
     text = text.replace(/((?:<li class="md-li">[\s\S]*?<\/li>\n?)+)/g, '<ul class="md-ul">$1</ul>');
 
-    // 9. Convert double newlines to paragraph breaks, single to <br/>
+    // 9. Convert double newlines to paragraph breaks, single newlines to spaces
     text = text.replace(/\n\n/g, '</p><p class="md-p">');
-    text = text.replace(/\n/g, '<br/>');
+    text = text.replace(/\n/g, ' ');
 
     // 10. Restore code blocks and inline codes
     text = text.replace(/\x00CODEBLOCK(\d+)\x00/g, (_m: string, idx: string) => codeBlocks[parseInt(idx)] || '');

migrations/007_evolution_tables.sql

@@ -70,7 +70,7 @@ CREATE TABLE IF NOT EXISTS `skill_trajectory_links` (
     `skill_name` VARCHAR(200) NOT NULL,
     `user_id` VARCHAR(36) NOT NULL,
     `trajectory_id` VARCHAR(36),
-    `atom_id` VARCHAR(36),
+    `atom_id` VARCHAR(128),
     `weightscore` INT DEFAULT 0,
     `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
     INDEX `idx_stl_user_skill` (`user_id`, `skill_name`),

migrations/021_widen_atom_id.sql

@@ -0,0 +1,7 @@
+-- 021: 加宽 skill_trajectory_links.atom_id 列
+-- 背景：atom_id 实际值形如 "{trajectory_id}_atom_{i}"（UUID 36 + "_atom_" + 序号 ≈ 45 字符），
+-- 原 VARCHAR(36) 过短导致写入时 DataError(1406) Data too long，并使会话进入 rolled-back 状态，
+-- 级联触发 PendingRollbackError 与日志 trace_id KeyError 刷屏。
+-- 本迁移幂等：重复执行 MODIFY 到相同类型为无害 no-op。
+
+ALTER TABLE `skill_trajectory_links` MODIFY COLUMN `atom_id` VARCHAR(128) NULL;