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

.gitignore

@@ -1,10 +1,10 @@
 # Workspace/editor
-.vscode/*
-!.vscode/launch.json
-!.vscode/tasks.json
-!.vscode/extensions.json
-!.vscode/settings.json
-frontend-web/.vscode/
+.vscode/*
+!.vscode/launch.json
+!.vscode/tasks.json
+!.vscode/extensions.json
+!.vscode/settings.json
+frontend-web/.vscode/
 node_modules/
 # Claude Code local-only settings (per-user permissions, not shared)
 .claude/settings.local.json
@@ -56,9 +56,9 @@ offline-backend-20260505/bundle/start_backend.sh
 offline-backend-20260505/bundle/stop_backend.sh
 
 # offline-backend-20260512 runtime artifacts (large files, local config, data)
-offline-backend-20260512/.env.example
-offline-backend-20260512/.env
-offline-backend-20260512/DEPLOY_BACKEND_OFFLINE_ZH.md
+offline-backend-20260512/.env.example
+offline-backend-20260512/.env
+offline-backend-20260512/DEPLOY_BACKEND_OFFLINE_ZH.md
 offline-backend-20260512/SHA256SUMS
 offline-backend-20260512/config.yaml.example
 offline-backend-20260512/data/
@@ -66,14 +66,14 @@ offline-backend-20260512/deerflow-backend-offline-image-20260505.tar
 offline-backend-20260512/extensions_config.json
 offline-backend-20260512/skills/
 offline-backend-20260512/wheelhouse/
-offline-backend-20260512/backend/.deer-flow/data/*.db
-offline-backend-20260512/backend/.deer-flow/data/*.db-*
-offline-backend-20260512/backend/.deer-flow/*
-offline-backend-20260512/backend/.env
-offline-backend-20260512/backend/.env.local
-offline-backend-20260512/start_backend.sh
-offline-backend-20260512/stop_backend.sh
-offline-backend-20260512/check_backend.sh
+offline-backend-20260512/backend/.deer-flow/data/*.db
+offline-backend-20260512/backend/.deer-flow/data/*.db-*
+offline-backend-20260512/backend/.deer-flow/*
+offline-backend-20260512/backend/.env
+offline-backend-20260512/backend/.env.local
+offline-backend-20260512/start_backend.sh
+offline-backend-20260512/stop_backend.sh
+offline-backend-20260512/check_backend.sh
 
 hermes-agent-main/
 
@@ -84,8 +84,8 @@ offline-backend-20260512/backend/.deer-flow/*
 
 # Per-user skill_evolution overrides — runtime data written by the API
 offline-backend-20260512/backend/skill_evolution.json
-skills/
-hermes-agent-main/
+skills/
+hermes-agent-main/
 .gitignore
 offline-backend-20260512/backend/tests/*
 !offline-backend-20260512/backend/tests/test_llmwiki_weknora.py
@@ -101,6 +101,17 @@ offline-backend-20260512/backend/tests/*
 !offline-backend-20260512/backend/tests/test_llmwiki_wiki_sync.py
 !offline-backend-20260512/backend/tests/test_external_llmwiki_search.py
 !offline-backend-20260512/backend/tests/test_llmwiki_wiki_retrieval.py
+# Deep-research reliability regression coverage.
+!offline-backend-20260512/backend/tests/test_deep_research_persistence.py
+!offline-backend-20260512/backend/tests/test_deep_research_event_sink.py
+!offline-backend-20260512/backend/tests/test_deep_research_executor_reliability.py
+!offline-backend-20260512/backend/tests/test_deep_research_start_job.py
+!offline-backend-20260512/backend/tests/test_summarization_human_message.py
+!offline-backend-20260512/backend/tests/test_compact_menu_overrides.py
+# Independent enterprise-research persistence, HTTP and race regressions.
+!offline-backend-20260512/backend/tests/test_enterprise_research_tasks.py
+# Position-roundtable per-turn write/present cap (weak-model duplicate artifacts).
+!offline-backend-20260512/backend/tests/test_position_artifact_cap.py
 deploy
 .history
 
@@ -110,22 +121,22 @@ git-clone/
 # Repo-root offline dependency pack (local only)
 /dist/
 
-# Frontend offline pack working directories
-frontend-web/.offline-pack-build/
-frontend-web/.offline-extract-test/
-frontend-web-node_modules-offline-*.tar.gz
-
-# Local dependency caches and backend scratch archives
-/.pnpm-store/
-/offline-backend-20260512/backend/backend*.zip
-
-# Local offline bundles and scratch tooling
-/*.tar.gz
-/offline-backend-20260512/*.zip
-/tmp/
-
-.codegraph
-codegraph.mdc
+# Frontend offline pack working directories
+frontend-web/.offline-pack-build/
+frontend-web/.offline-extract-test/
+frontend-web-node_modules-offline-*.tar.gz
+
+# Local dependency caches and backend scratch archives
+/.pnpm-store/
+/offline-backend-20260512/backend/backend*.zip
+
+# Local offline bundles and scratch tooling
+/*.tar.gz
+/offline-backend-20260512/*.zip
+/tmp/
+
+.codegraph
+codegraph.mdc
 
 docs/aidev-docs
 docs/backups
@@ -142,4 +153,4 @@ offline-backend-20260512/backend/uv.lock
 __pycache__/
 
 # misc
-.DS_Store
+.DS_Store