Merge branch 'dhk-1' into 'master'

代码修改

See merge request knowledge-base-bj/deerflow-server!96

frontend-web/.env.production

@@ -27,7 +27,7 @@ VITE_AUTH_BASE_URL=https://auth.y.uat.4.cn
 VITE_AIPI_PGLINKTO_URL=https://pg.b.uat.4.cn
 VITE_AIPI_XKLINKTO_URL=https://kz.b.uat.4.cn
 # 工作室/笔记本前端地址（用于 auth/callback 等跳转）
-VITE_AIPI_FRONTEND_URL=https://knowledgetoolserver.b.uat.4.cn
+VITE_AIPI_FRONTEND_URL=https://knowledgetoolweb.b.uat.4.cn
 # 工作室侧边栏显示开关；仅控制入口显示，展开内容仍依赖 notebook 接口成功返回数据
 VITE_STUDIO_ENABLED=true
 

frontend-web/src/roundtable-planning/components/Step2Panel.tsx

@@ -12,6 +12,7 @@
  *
  * 圆桌可视化 + 博弈边界调控台目前**未启用**(原代码用 `false &&` 隐藏),
  * 这里保留同样的占位逻辑,后续要恢复时改 `SHOW_VISUALIZER` 即可。
+ * 「后台挂起」按钮同理,改 `SHOW_BACKGROUND_SUSPEND` 即可恢复。
  *
  * 状态全部来自 `useStep2Orchestration` —— 本组件不调任何后端、不持久化。
  */
@@ -23,10 +24,12 @@ import {
   Loader2,
   Pause,
   Play,
-  Rocket,
   Sparkles,
 } from "lucide-react";
 
+/** 后台挂起入口 —— 暂时隐藏,恢复时改为 true。 */
+const SHOW_BACKGROUND_SUSPEND = false;
+
 import { PersonaDrawer } from "@/roundtable-planning/components/PersonaDrawer";
 import { ScrollToBottomButton } from "@/roundtable-planning/components/ScrollToBottomButton";
 import { Step2SandboxLayout } from "@/roundtable-planning/components/Step2SandboxLayout";
@@ -367,17 +370,20 @@ export function Step2Panel(props: Step2PanelProps) {
           干预并发送
         </button>
 
-        <div className="h-6 w-[1px] bg-slate-200 shrink-0" />
+        {SHOW_BACKGROUND_SUSPEND && (
+          <>
+            <div className="h-6 w-[1px] bg-slate-200 shrink-0" />
 
-        <button
+            <button
-          type="button"
+              type="button"
-          onClick={onBackgroundSuspend}
+              onClick={onBackgroundSuspend}
-          title="把当前研讨转入后台自动跑到结果绘制完成；可离开页面，进度在历史记录里查看"
+              title="把当前研讨转入后台自动跑到结果绘制完成；可离开页面，进度在历史记录里查看"
-          className="bg-white border border-slate-200 hover:bg-slate-50 text-slate-700 text-xs font-bold px-4 py-2.5 rounded-xl transition shrink-0 flex items-center gap-1 active:scale-95 cursor-pointer dark:bg-secondary dark:text-foreground dark:border-border"
+              className="bg-white border border-slate-200 hover:bg-slate-50 text-slate-700 text-xs font-bold px-4 py-2.5 rounded-xl transition shrink-0 flex items-center gap-1 active:scale-95 cursor-pointer dark:bg-secondary dark:text-foreground dark:border-border"
-        >
+            >
-          <Rocket className="w-3.5 h-3.5 text-primary" />
+              后台挂起
-          后台挂起
+            </button>
-        </button>
+          </>
+        )}
 
         <button
           type="button"

offline-backend-20260512/backend/packages/harness/deerflow/persistence/migrations/versions/20260604_01_roundtable_jobs.py

@@ -7,7 +7,7 @@ MySQL (can exceed the 64 KB TEXT cap) and plain TEXT elsewhere — matching
 ``PortableLongText`` on ``RoundtableJobRow``. ``create_all`` adds the table for
 brand-new DBs; this revision creates it on DBs that predate it.
 
-Revision ID: 20260604_01
+Revision ID: 20260604_02
 Revises: 20260603_01
 Create Date: 2026-06-04
 """
@@ -20,7 +20,7 @@ from sqlalchemy import inspect
 from sqlalchemy.dialects.mysql import LONGTEXT
 
 
-revision = "20260604_01"
+revision = "20260604_02"
 down_revision = "20260603_01"
 branch_labels = None
 depends_on = None

offline-backend-20260512/backend/packages/harness/deerflow/persistence/migrations/versions/20260605_01_roundtable_jobs_dialogues.py

@@ -18,7 +18,7 @@ from sqlalchemy.dialects.mysql import LONGTEXT
 
 
 revision = "20260605_01"
-down_revision = "20260604_01"
+down_revision = "20260604_02"
 branch_labels = None
 depends_on = None
 

offline-backend-20260512/backend/packages/harness/deerflow/persistence/migrations/versions/20260607_01_user_custom_prompts_agent_id_fixup.py

@@ -0,0 +1,47 @@
+"""Add ``agent_id`` to ``user_custom_prompts`` when the parallel branch was skipped.
+
+Some deployments reached ``20260606_01`` via the roundtable-jobs migration branch
+(``20260603_01`` → ``20260604_01`` jobs → …) without running the sibling branch
+that adds ``agent_id`` (``20260603_02``). This idempotent fixup applies the
+missing column for those DBs.
+
+Revision ID: 20260607_01
+Revises: 20260606_01
+Create Date: 2026-06-07
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import inspect
+
+
+revision = "20260607_01"
+down_revision = "20260606_01"
+branch_labels = None
+depends_on = None
+
+
+def _has_table(table_name: str) -> bool:
+    inspector = inspect(op.get_bind())
+    return table_name in inspector.get_table_names()
+
+
+def _has_column(table_name: str, column_name: str) -> bool:
+    inspector = inspect(op.get_bind())
+    return any(col["name"] == column_name for col in inspector.get_columns(table_name))
+
+
+def upgrade() -> None:
+    if not _has_table("user_custom_prompts"):
+        return
+    if not _has_column("user_custom_prompts", "agent_id"):
+        op.add_column("user_custom_prompts", sa.Column("agent_id", sa.String(64), nullable=True))
+        op.create_index("ix_user_custom_prompts_agent_id", "user_custom_prompts", ["agent_id"])
+
+
+def downgrade() -> None:
+    if _has_table("user_custom_prompts") and _has_column("user_custom_prompts", "agent_id"):
+        op.drop_index("ix_user_custom_prompts_agent_id", table_name="user_custom_prompts")
+        op.drop_column("user_custom_prompts", "agent_id")

offline-backend-20260512/backend/packages/harness/deerflow/persistence/migrations/versions/20260607_02_merge_agent_pins_and_fixup.py

@@ -0,0 +1,22 @@
+"""Merge parallel migration branches (agent_pins + roundtable jobs fixup).
+
+Revision ID: 20260607_02
+Revises: 20260604_01, 20260607_01
+Create Date: 2026-06-07
+"""
+
+from __future__ import annotations
+
+
+revision = "20260607_02"
+down_revision = ("20260604_01", "20260607_01")
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass