From f8c5a76ce6930f85770c91f141d5930f91624597 Mon Sep 17 00:00:00 2001
From: iven <iven_h@qq.com>
Date: Sun, 12 Apr 2026 20:37:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(industry):=20=E5=AE=A1=E8=AE=A1=E6=94=B6?=
 =?UTF-8?q?=E5=B0=BE=20=E2=80=94=20MEDIUM=20+=20LOW=20=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=B8=85=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

M-1: Industries 创建弹窗添加 cold_start_template + pain_seed_categories
M-3: industryStore console.warn → createLogger 结构化日志
B2: classify_with_industries 平局打破 + 归一化因子 3.0 文档化
S3: set_account_industries 验证移入事务内消除 TOCTOU
T1: 4 个 SaaS 请求类型添加 deny_unknown_fields
I3: store_trigger_experience Debug 格式 → signal_name 描述名
L-1: 删除 Accounts.tsx 死代码 editingIndustries
L-3: Industries.tsx filters 类型补全 source 字段
---
 admin-v2/src/pages/Accounts.tsx                     |  3 ---
 admin-v2/src/pages/Industries.tsx                   |  8 +++++++-
 .../zclaw-runtime/src/middleware/butler_router.rs   |  6 +++++-
 crates/zclaw-saas/src/industry/service.rs           | 13 +++++++------
 crates/zclaw-saas/src/industry/types.rs             |  4 ++++
 desktop/src-tauri/src/intelligence_hooks.rs         |  2 +-
 desktop/src/store/industryStore.ts                  |  5 ++++-
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/admin-v2/src/pages/Accounts.tsx b/admin-v2/src/pages/Accounts.tsx
index 98ecb76..480ed96 100644
--- a/admin-v2/src/pages/Accounts.tsx
+++ b/admin-v2/src/pages/Accounts.tsx
@@ -42,7 +42,6 @@ export default function Accounts() {
   const [modalOpen, setModalOpen] = useState(false)
   const [editingId, setEditingId] = useState<string | null>(null)
   const [searchParams, setSearchParams] = useState<Record<string, string>>({})
-  const [editingIndustries, setEditingIndustries] = useState<string[]>([])
 
   const { data, isLoading } = useQuery({
     queryKey: ['accounts', searchParams],
@@ -67,7 +66,6 @@ export default function Accounts() {
   useEffect(() => {
     if (accountIndustries && editingId) {
       const ids = accountIndustries.map((item) => item.industry_id)
-      setEditingIndustries(ids)
       form.setFieldValue('industry_ids', ids)
     }
   }, [accountIndustries, editingId, form])
@@ -212,7 +210,6 @@ export default function Accounts() {
   const handleClose = () => {
     setModalOpen(false)
     setEditingId(null)
-    setEditingIndustries([])
     form.resetFields()
   }
 
diff --git a/admin-v2/src/pages/Industries.tsx b/admin-v2/src/pages/Industries.tsx
index 10dca2b..77eaa1f 100644
--- a/admin-v2/src/pages/Industries.tsx
+++ b/admin-v2/src/pages/Industries.tsx
@@ -31,7 +31,7 @@ function IndustryListPanel() {
   const queryClient = useQueryClient()
   const [page, setPage] = useState(1)
   const [pageSize, setPageSize] = useState(20)
-  const [filters, setFilters] = useState<{ status?: string }>({})
+  const [filters, setFilters] = useState<{ status?: string; source?: string }>({})
   const [editId, setEditId] = useState<string | null>(null)
   const [createOpen, setCreateOpen] = useState(false)
 
@@ -337,6 +337,12 @@ function IndustryCreateModal({ open, onClose }: {
         <Form.Item name="system_prompt" label="系统提示词">
           <TextArea rows={4} placeholder="行业专属系统提示词" />
         </Form.Item>
+        <Form.Item name="cold_start_template" label="冷启动模板" extra="新用户首次对话时使用的引导模板">
+          <TextArea rows={3} placeholder="如：您好！我是您的{行业}管家，可以帮您处理..." />
+        </Form.Item>
+        <Form.Item name="pain_seed_categories" label="痛点种子类别" extra="预置的痛点分类，用逗号或回车分隔">
+          <Select mode="tags" placeholder="如：库存管理、客户服务、合规" />
+        </Form.Item>
       </Form>
     </Modal>
   )
diff --git a/crates/zclaw-runtime/src/middleware/butler_router.rs b/crates/zclaw-runtime/src/middleware/butler_router.rs
index f0e8cc1..9888931 100644
--- a/crates/zclaw-runtime/src/middleware/butler_router.rs
+++ b/crates/zclaw-runtime/src/middleware/butler_router.rs
@@ -130,11 +130,15 @@ impl KeywordClassifier {
         if hits == 0 {
             return 0.0;
         }
-        // Normalize: more hits = higher score, capped at 1.0
+        // Normalize: 3 keyword hits → score 1.0 (saturated). Threshold 0.2 ≈ 0.6 hits.
         (hits as f32 / 3.0).min(1.0)
     }
 
     /// Classify against dynamic industry keyword configs.
+    ///
+    /// Tie-breaking: when two industries score equally, the *first* entry wins
+    /// (keeps existing best on `<=`). Industries should be ordered by priority
+    /// in the config array if specific tie-breaking is desired.
     fn classify_with_industries(query: &str, industries: &[IndustryKeywordConfig]) -> Option<RoutingHint> {
         let lower = query.to_lowercase();
 
diff --git a/crates/zclaw-saas/src/industry/service.rs b/crates/zclaw-saas/src/industry/service.rs
index 69279f6..230c3f7 100644
--- a/crates/zclaw-saas/src/industry/service.rs
+++ b/crates/zclaw-saas/src/industry/service.rs
@@ -204,24 +204,25 @@ pub async fn set_account_industries(
     req: &SetAccountIndustriesRequest,
 ) -> SaasResult<Vec<AccountIndustryItem>> {
     let now = chrono::Utc::now();
-
-    // 批量验证：一次查询所有行业是否存在且启用
     let ids: Vec<&str> = req.industries.iter().map(|e| e.industry_id.as_str()).collect();
+
+    // 事务：验证 + DELETE + INSERT 原子执行，消除 TOCTOU
+    let mut tx = pool.begin().await.map_err(SaasError::Database)?;
+
+    // 验证：所有行业必须存在且启用
     let valid_count: (i64,) = sqlx::query_as(
         "SELECT COUNT(*) FROM industries WHERE id = ANY($1) AND status = 'active'"
     )
     .bind(&ids)
-    .fetch_one(pool)
+    .fetch_one(&mut *tx)
     .await
     .map_err(SaasError::Database)?;
 
     if valid_count.0 != ids.len() as i64 {
+        tx.rollback().await.ok();
         return Err(SaasError::InvalidInput("部分行业不存在或已禁用".to_string()));
     }
 
-    // 事务性 DELETE + INSERT
-    let mut tx = pool.begin().await.map_err(SaasError::Database)?;
-
     sqlx::query("DELETE FROM account_industries WHERE account_id = $1")
         .bind(account_id)
         .execute(&mut *tx)
diff --git a/crates/zclaw-saas/src/industry/types.rs b/crates/zclaw-saas/src/industry/types.rs
index 53e1282..fd254af 100644
--- a/crates/zclaw-saas/src/industry/types.rs
+++ b/crates/zclaw-saas/src/industry/types.rs
@@ -36,6 +36,7 @@ pub struct IndustryListItem {
 
 /// 创建行业请求
 #[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct CreateIndustryRequest {
     pub id: String,
     pub name: String,
@@ -57,6 +58,7 @@ pub struct CreateIndustryRequest {
 
 /// 更新行业请求
 #[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct UpdateIndustryRequest {
     pub name: Option<String>,
     pub icon: Option<String>,
@@ -99,12 +101,14 @@ pub struct AccountIndustryItem {
 
 /// 设置用户行业请求
 #[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct SetAccountIndustriesRequest {
     pub industries: Vec<AccountIndustryEntry>,
 }
 
 /// 用户行业条目
 #[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct AccountIndustryEntry {
     pub industry_id: String,
     #[serde(default)]
diff --git a/desktop/src-tauri/src/intelligence_hooks.rs b/desktop/src-tauri/src/intelligence_hooks.rs
index 8b09563..a60500b 100644
--- a/desktop/src-tauri/src/intelligence_hooks.rs
+++ b/desktop/src-tauri/src/intelligence_hooks.rs
@@ -426,7 +426,7 @@ async fn store_trigger_experience(
     let entry = zclaw_growth::MemoryEntry::new(
         agent_id,
         zclaw_growth::MemoryType::Experience,
-        &format!("trigger/{:?}", signal),
+        &format!("trigger/{}", signal_name),
         content,
     );
 
diff --git a/desktop/src/store/industryStore.ts b/desktop/src/store/industryStore.ts
index 3dcfffd..aaed791 100644
--- a/desktop/src/store/industryStore.ts
+++ b/desktop/src/store/industryStore.ts
@@ -9,6 +9,9 @@ import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import type { IndustryFullConfig, AccountIndustryItem } from '../lib/saas-client';
 import { saasClient } from '../lib/saas-client';
+import { createLogger } from '../lib/logger';
+
+const log = createLogger('industryStore');
 
 // ============ Types ============
 
@@ -61,7 +64,7 @@ export const useIndustryStore = create<IndustryStore>()(
               configs[item.industry_id] = fullConfig;
             } catch (err) {
               // Non-fatal: one industry failing shouldn't block others
-              console.warn(`[industryStore] Failed to fetch config for ${item.industry_id}:`, err);
+              log.warn(`Failed to fetch config for ${item.industry_id}:`, err);
             }
           }