Merge remote-tracking branch 'origin/master' into ji

# Conflicts:
#	.gitignore
#	frontend-web/src/components/workspace/artifacts/context.tsx
#	frontend-web/src/components/workspace/messages/message-group.tsx
#	offline-backend-20260512/backend/CLAUDE.md
#	offline-backend-20260512/backend/README.md
#	offline-backend-20260512/backend/app/gateway/app.py
#	offline-backend-20260512/backend/app/gateway/deps.py
#	offline-backend-20260512/backend/app/gateway/routers/llmwiki.py
This commit is contained in:
吉鑫升 committed 2026-08-24 14:21:19 +08:00
commit e818c24769
262 files changed
+29527 -5236

No files matched your search

@@ -35,9 +35,10 @@ from app.gateway.routers import (
auth,
browser_context,
business_mapping,
channels,
channels,
checkpoint_migration,
compact_menu_overrides,
external_llmwiki,
feedback,
fixed_questions,
dashboard_sessions,
@@ -47,10 +48,9 @@ from app.gateway.routers import (
knowledge,
knowledge_ingest,
light_apps,
llm_metrics,
llmwiki,
llm_metrics,
llmwiki,
llmwiki_index,
external_llmwiki,
mcp,
memory,
menu_overrides,
@@ -89,6 +89,7 @@ from app.gateway.routers import (
tags,
task_buttons,
taskcop_tasks,
report_structures,
task_reports,
thread_runs,
tool_metrics,
@@ -988,12 +989,11 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
async with langgraph_runtime(app):
logger.info("LangGraph runtime initialised")
# Run Alembic migrations before anything else touches the schema.
await _run_db_migrations()
# Run Alembic migrations before anything else touches the schema.
await _run_db_migrations()
# Local Wiki mirror/index scans are opt-in and run outside request
# handling. Each knowledge base still uses a database lease, so this is
# safe when multiple Gateway workers start the same scheduler.
# handling. Per-library database leases keep multi-worker startup safe.
app.state.llmwiki_index_scheduler_task = None
local_wiki_index = app.state.config.llmwiki.local_wiki_index
if (
@@ -1006,7 +1006,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
app.state.llmwiki_index_scheduler_task = asyncio.create_task(
local_wiki_index_scheduler_loop(app)
)
# ?? recall_budget cache?? DB ????,? get_effective_memory_config ?????
try:
from deerflow.config.memory_config import load_recall_budget_cache
@@ -1188,7 +1188,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
except Exception:
logger.exception("Scheduled task service failed to start")
yield
yield
llmwiki_index_scheduler_task = getattr(app.state, "llmwiki_index_scheduler_task", None)
if llmwiki_index_scheduler_task is not None:
@@ -1488,8 +1488,8 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# MCP API is mounted at /api/mcp
app.include_router(mcp.router)
# DeerFlow-native LLMWiki management/search BFF (conditionally backed by WeKnora).
app.include_router(llmwiki.router)
# DeerFlow-native LLMWiki management/search BFF (conditionally backed by WeKnora).
app.include_router(llmwiki.router)
app.include_router(llmwiki_index.router)
app.include_router(external_llmwiki.router)
@@ -1557,13 +1557,13 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# Light-app registry (?????) at /api/light-apps
app.include_router(light_apps.router)
# Sidebar-menu overrides (菜单管理) at /api/menu-overrides
app.include_router(menu_overrides.router)
# Compact/sidebar-summary menu overrides at /api/compact-menu-overrides
app.include_router(compact_menu_overrides.router)
# Sensitive-word map (敏感词管理 / 脱敏词) at /api/sensitive-words
# Sidebar-menu overrides (菜单管理) at /api/menu-overrides
app.include_router(menu_overrides.router)
# Compact/sidebar-summary menu overrides at /api/compact-menu-overrides
app.include_router(compact_menu_overrides.router)
# Sensitive-word map (敏感词管理 / 脱敏词) at /api/sensitive-words
app.include_router(sensitive_words.router)
# Skill URL/IP batch replace (技能地址管理) at /api/skill-addresses
@@ -1578,6 +1578,9 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# Admin exact-match question/answer short-circuit at /api/fixed-questions
app.include_router(fixed_questions.router)
# Deep-research report structures (工作流配置 / 报告结构) at /api/report-structures
app.include_router(report_structures.router)
# Temporary compatibility bridge for the TaskCOP situation-overview frontend.
app.include_router(taskcop_tasks.router)
@@ -1595,6 +1598,9 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# Deep Research (深度研究) API at /api/deep-research
app.include_router(deep_research.router)
# The independent enterprise-research workbench is temporarily disabled.
# Do not mount /api/enterprise-research while its MySQL schema is inactive.
# Suggestions API is mounted at /api/threads/{thread_id}/suggestions
app.include_router(suggestions.router)
@@ -1689,9 +1695,9 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
# --- ?????????? /page/workspace/roundtable/planning?---
# ??? app/gateway/routers/{multi_agent,intent,recommend}.py?
# ??? frontend-web/docs/multi-agent-backend-dev.md
app.include_router(multi_agent.router) # Step 2?init(SSE) + run/stream(leader|special)
app.include_router(intent.router) # Step 1?/api/intent/init + /stream
app.include_router(recommend.router) # Step 1?2?/api/recommend/stream?? init?
app.include_router(multi_agent.router) # Step 2?init(SSE) + run/stream(leader|special)
app.include_router(intent.router) # Step 1?/api/intent/init + /stream
app.include_router(recommend.router) # Step 1?2?/api/recommend/stream?? init?
# Step 3 ????/?????? artifacts.router?/api/threads/{id}/artifacts?
# Health probes are always unauthenticated (see