fix(sandbox): cleanup dead containers and avoid lock-held liveness checks

Agent-Logs-Url: https://github.com/bytedance/deer-flow/sessions/96707445-0f8b-4901-8ef3-d8e5667f8a05

Co-authored-by: WillemJiang <219644+WillemJiang@users.noreply.github.com>

.env.example

@@ -9,9 +9,8 @@ JINA_API_KEY=your-jina-api-key
 
 # InfoQuest API Key
 INFOQUEST_API_KEY=your-infoquest-api-key
-# Browser CORS allowlist for split-origin or port-forwarded deployments (comma-separated exact origins).
+# CORS Origins (comma-separated) - e.g., http://localhost:3000,http://localhost:3001
-# Leave unset when using the unified nginx endpoint, e.g. http://localhost:2026.
+# CORS_ORIGINS=http://localhost:3000
-# GATEWAY_CORS_ORIGINS=http://localhost:3000,http://127.0.0.1:3000
 
 # Optional:
 # FIRECRAWL_API_KEY=your-firecrawl-api-key

CONTRIBUTING.md

@@ -46,12 +46,12 @@ Docker provides a consistent, isolated environment with all dependencies pre-con
    All services will start with hot-reload enabled:
    - Frontend changes are automatically reloaded
    - Backend changes trigger automatic restart
-   - Gateway-hosted LangGraph-compatible runtime supports hot-reload
+   - LangGraph server supports hot-reload
 
 4. **Access the application**:
    - Web Interface: http://localhost:2026
    - API Gateway: http://localhost:2026/api/*
-   - LangGraph-compatible API: http://localhost:2026/api/langgraph/*
+   - LangGraph: http://localhost:2026/api/langgraph/*
 
 #### Docker Commands
 
@@ -94,7 +94,7 @@ Use these as practical starting points for development and review environments:
 If `make docker-init`, `make docker-start`, or `make docker-stop` fails on Linux with an error like below, your current user likely does not have permission to access the Docker daemon socket:
 
 ```text
-unable to get image 'deer-flow-gateway': permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock
+unable to get image 'deer-flow-dev-langgraph': permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock
 ```
 
 Recommended fix: add your current user to the `docker` group so Docker commands work without `sudo`.
@@ -131,7 +131,8 @@ Host Machine
 Docker Compose (deer-flow-dev)
   ├→ nginx (port 2026) ← Reverse proxy
   ├→ web (port 3000) ← Frontend with hot-reload
-  ├→ gateway (port 8001) ← Gateway API + LangGraph-compatible runtime with hot-reload
+  ├→ api (port 8001) ← Gateway API with hot-reload
+   ├→ langgraph (port 2024) ← LangGraph server with hot-reload
    └→ provisioner (optional, port 8002) ← Started only in provisioner/K8s sandbox mode
 ```
 
@@ -183,13 +184,17 @@ Required tools:
 
 If you need to start services individually:
 
-1. **Start backend service**:
+1. **Start backend services**:
    ```bash
-   # Terminal 1: Start Gateway API + embedded agent runtime (port 8001)
+   # Terminal 1: Start LangGraph Server (port 2024)
    cd backend
    make dev
 
-   # Terminal 2: Start Frontend (port 3000)
+   # Terminal 2: Start Gateway API (port 8001)
+   cd backend
+   make gateway
+
+   # Terminal 3: Start Frontend (port 3000)
    cd frontend
    pnpm dev
    ```
@@ -207,10 +212,10 @@ If you need to start services individually:
 
 The nginx configuration provides:
 - Unified entry point on port 2026
-- Rewrites `/api/langgraph/*` to Gateway's LangGraph-compatible API (8001)
+- Routes `/api/langgraph/*` to LangGraph Server (2024)
 - Routes other `/api/*` endpoints to Gateway API (8001)
 - Routes non-API requests to Frontend (3000)
-- Same-origin API routing; split-origin or port-forwarded browser clients should use the Gateway `GATEWAY_CORS_ORIGINS` allowlist
+- Centralized CORS handling
 - SSE/streaming support for real-time agent responses
 - Optimized timeouts for long-running operations
 
@@ -230,8 +235,8 @@ deer-flow/
 │       └── nginx.local.conf # Nginx config for local dev
 ├── backend/                 # Backend application
 │   ├── src/
-│   │   ├── gateway/        # Gateway API and LangGraph-compatible runtime (port 8001)
+│   │   ├── gateway/        # Gateway API (port 8001)
-│   │   ├── agents/         # LangGraph agent runtime used by Gateway
+│   │   ├── agents/         # LangGraph agents (port 2024)
 │   │   ├── mcp/            # Model Context Protocol integration
 │   │   ├── skills/         # Skills system
 │   │   └── sandbox/        # Sandbox execution
@@ -251,7 +256,8 @@ Browser
   ↓
 Nginx (port 2026) ← Unified entry point
   ├→ Frontend (port 3000) ← / (non-API requests)
-  └→ Gateway API (port 8001) ← /api/* and /api/langgraph/* (LangGraph-compatible agent interactions)
+  ├→ Gateway API (port 8001) ← /api/models, /api/mcp, /api/skills, /api/threads/*/artifacts
+  └→ LangGraph Server (port 2024) ← /api/langgraph/* (agent interactions)
 ```
 
 ## Development Workflow

Makefile

@@ -1,6 +1,6 @@
 # DeerFlow - Unified Development Environment
 
-.PHONY: help config config-upgrade check install setup doctor detect-thread-boundaries dev dev-daemon start start-daemon stop up down clean docker-init docker-start docker-stop docker-logs docker-logs-frontend docker-logs-gateway
+.PHONY: help config config-upgrade check install setup doctor dev dev-daemon start start-daemon stop up down clean docker-init docker-start docker-stop docker-logs docker-logs-frontend docker-logs-gateway
 
 BASH ?= bash
 BACKEND_UV_RUN = cd backend && uv run
@@ -23,7 +23,6 @@ help:
 	@echo "  make config          - Generate local config files (aborts if config already exists)"
 	@echo "  make config-upgrade  - Merge new fields from config.example.yaml into config.yaml"
 	@echo "  make check           - Check if all required tools are installed"
-	@echo "  make detect-thread-boundaries - Inventory async/thread boundary points"
 	@echo "  make install         - Install all dependencies (frontend + backend + pre-commit hooks)"
 	@echo "  make setup-sandbox   - Pre-pull sandbox container image (recommended)"
 	@echo "  make dev             - Start all services in development mode (with hot-reloading)"
@@ -52,9 +51,6 @@ setup:
 doctor:
 	@$(BACKEND_UV_RUN) python ../scripts/doctor.py
 
-detect-thread-boundaries:
-	@$(PYTHON) ./scripts/detect_thread_boundaries.py
-
 config:
 	@$(PYTHON) ./scripts/configure.py
 

README.md

@@ -245,8 +245,6 @@ make down   # Stop and remove containers
 
 Access: http://localhost:2026
 
-The unified nginx endpoint is same-origin by default and does not emit browser CORS headers. If you run a split-origin or port-forwarded browser client, set `GATEWAY_CORS_ORIGINS` to comma-separated exact origins such as `http://localhost:3000`; the Gateway then applies the CORS allowlist and matching CSRF origin checks.
-
 See [CONTRIBUTING.md](CONTRIBUTING.md) for detailed Docker development guide.
 
 #### Option 2: Local Development
@@ -546,15 +544,6 @@ LANGFUSE_BASE_URL=https://cloud.langfuse.com
 
 If you are using a self-hosted Langfuse instance, set `LANGFUSE_BASE_URL` to your deployment URL.
 
-**Trace correlation fields.** Every agent run is annotated with Langfuse's reserved trace attributes so the Sessions and Users pages light up automatically:
-
-- `session_id` = LangGraph `thread_id` — groups every trace of the same conversation
-- `user_id` = effective user from `get_effective_user_id()` (falls back to `default` in no-auth mode)
-- `trace_name` = assistant id (defaults to `lead-agent`)
-- `tags` = `[env:<DEER_FLOW_ENV>, model:<model_name>]` (omitted when not set)
-
-These are injected into `RunnableConfig.metadata` at the graph invocation root for both the gateway path (`runtime/runs/worker.py::run_agent`) and the embedded path (`client.py::DeerFlowClient.stream`), so any LangChain-compatible callback can read them. Set `DEER_FLOW_ENV` (or `ENVIRONMENT`) to tag traces by deployment environment.
-
 #### Using Both Providers
 
 If both LangSmith and Langfuse are enabled, DeerFlow attaches both tracing callbacks and reports the same model activity to both systems.
@@ -637,7 +626,7 @@ See [`skills/public/claude-to-deerflow/SKILL.md`](skills/public/claude-to-deerfl
 
 Complex tasks rarely fit in a single pass. DeerFlow decomposes them.
 
-The lead agent can spawn sub-agents on the fly — each with its own scoped context, tools, and termination conditions. Sub-agents run in parallel when possible, report back structured results, and the lead agent synthesizes everything into a coherent output. When token usage tracking is enabled, completed sub-agent usage is attributed back to the dispatching step.
+The lead agent can spawn sub-agents on the fly — each with its own scoped context, tools, and termination conditions. Sub-agents run in parallel when possible, report back structured results, and the lead agent synthesizes everything into a coherent output.
 
 This is how DeerFlow handles tasks that take minutes to hours: a research task might fan out into a dozen sub-agents, each exploring a different angle, then converge into a single report — or a website — or a slide deck with generated visuals. One harness, many hands.
 

README_fr.md

@@ -228,7 +228,7 @@ make down   # Stop and remove containers
 ```
 
 > [!NOTE]
-> Le runtime d'agent s'exécute actuellement dans la Gateway. nginx réécrit `/api/langgraph/*` vers l'API compatible LangGraph servie par la Gateway.
+> Le serveur d'agents LangGraph fonctionne actuellement via `langgraph dev` (le serveur CLI open source).
 
 Accès : http://localhost:2026
 
@@ -296,8 +296,8 @@ DeerFlow peut recevoir des tâches depuis des applications de messagerie. Les ca
 
 ```yaml
 channels:
-  # LangGraph-compatible Gateway API base URL (default: http://localhost:8001/api)
+  # LangGraph Server URL (default: http://localhost:2024)
-  langgraph_url: http://localhost:8001/api
+  langgraph_url: http://localhost:2024
   # Gateway API URL (default: http://localhost:8001)
   gateway_url: http://localhost:8001
 

README_ja.md

@@ -181,7 +181,7 @@ make down   # コンテナを停止して削除
 ```
 
 > [!NOTE]
-> Agentランタイムは現在Gateway内で実行されます。`/api/langgraph/*`はnginxによってGatewayのLangGraph-compatible APIへ書き換えられます。
+> LangGraphエージェントサーバーは現在`langgraph dev`（オープンソースCLIサーバー）経由で実行されます。
 
 アクセス: http://localhost:2026
 
@@ -249,8 +249,8 @@ DeerFlowはメッセージングアプリからのタスク受信をサポート
 
 ```yaml
 channels:
-  # LangGraph-compatible Gateway API base URL（デフォルト: http://localhost:8001/api）
+  # LangGraphサーバーURL（デフォルト: http://localhost:2024）
-  langgraph_url: http://localhost:8001/api
+  langgraph_url: http://localhost:2024
   # Gateway API URL（デフォルト: http://localhost:8001）
   gateway_url: http://localhost:8001
 

README_zh.md

@@ -184,7 +184,7 @@ make down   # 停止并移除容器
 ```
 
 > [!NOTE]
-> 当前 Agent 运行时嵌入在 Gateway 中运行，`/api/langgraph/*` 会由 nginx 重写到 Gateway 的 LangGraph-compatible API。
+> 当前 LangGraph agent server 通过开源 CLI 服务 `langgraph dev` 运行。
 
 访问地址：http://localhost:2026
 
@@ -254,8 +254,8 @@ DeerFlow 支持从即时通讯应用接收任务。只要配置完成，对应
 
 ```yaml
 channels:
-  # LangGraph-compatible Gateway API base URL（默认：http://localhost:8001/api）
+  # LangGraph Server URL（默认：http://localhost:2024）
-  langgraph_url: http://localhost:8001/api
+  langgraph_url: http://localhost:2024
   # Gateway API URL（默认：http://localhost:8001）
   gateway_url: http://localhost:8001
 

backend/CLAUDE.md

@@ -165,7 +165,7 @@ Lead-agent middlewares are assembled in strict append order across `packages/har
 8. **ToolErrorHandlingMiddleware** - Converts tool exceptions into error `ToolMessage`s so the run can continue instead of aborting
 9. **SummarizationMiddleware** - Context reduction when approaching token limits (optional, if enabled)
 10. **TodoListMiddleware** - Task tracking with `write_todos` tool (optional, if plan_mode)
-11. **TokenUsageMiddleware** - Records token usage metrics when token tracking is enabled (optional); subagent usage is cached by `tool_call_id` only while token usage is enabled and merged back into the dispatching AIMessage by message position rather than message id
+11. **TokenUsageMiddleware** - Records token usage metrics when token tracking is enabled (optional)
 12. **TitleMiddleware** - Auto-generates thread title after first complete exchange and normalizes structured message content before prompting the title model
 13. **MemoryMiddleware** - Queues conversations for async memory update (filters to user + final AI responses)
 14. **ViewImageMiddleware** - Injects base64 image data before LLM call (conditional on vision support)
@@ -184,18 +184,6 @@ Setup: Copy `config.example.yaml` to `config.yaml` in the **project root** direc
 
 **Config Caching**: `get_app_config()` caches the parsed config, but automatically reloads it when the resolved config path changes or the file's mtime increases. This keeps Gateway and LangGraph reads aligned with `config.yaml` edits without requiring a manual process restart.
 
-**Config Hot-Reload Boundary**: Gateway dependencies route through `get_app_config()` on every request, so per-run fields like `models[*].max_tokens`, `summarization.*`, `title.*`, `memory.*`, `subagents.*`, `tools[*]`, and the agent system prompt pick up `config.yaml` edits on the next message. `AppConfig` is intentionally **not** cached on `app.state` — `lifespan()` keeps a local `startup_config` variable for one-shot bootstrap work (logging level, channels, `langgraph_runtime` engines) and passes it explicitly to `langgraph_runtime(app, startup_config)`. Infrastructure fields are **restart-required**:
-
-| Field | Why a restart is required |
-|---|---|
-| `database.*` | `init_engine_from_config()` runs once during `langgraph_runtime()` startup; the SQLAlchemy engine holds the connection pool. |
-| `checkpointer.*` (including SQLite WAL/journal settings) | `make_checkpointer()` binds the persistent checkpointer once at startup. |
-| `run_events.*` | `make_run_event_store()` selects memory- vs. SQL-backed implementation at startup. |
-| `stream_bridge.*` | `make_stream_bridge()` constructs the bridge object once. |
-| `sandbox.use` | `get_sandbox_provider()` caches the provider singleton (`_default_sandbox_provider`); a new class path takes effect only on next process start. |
-| `log_level` | `apply_logging_level()` is called only in `app.py` startup; it mutates the root logger's level, and `get_app_config()` returning a fresh `AppConfig` does not retrigger it. |
-| `channels.*` IM platform credentials | `start_channel_service()` is invoked once during startup; live channels are not rebuilt on config change. |
-
 Configuration priority:
 1. Explicit `config_path` argument
 2. `DEER_FLOW_CONFIG_PATH` environment variable
@@ -219,8 +207,6 @@ Configuration priority:
 
 FastAPI application on port 8001 with health check at `GET /health`. Set `GATEWAY_ENABLE_DOCS=false` to disable `/docs`, `/redoc`, and `/openapi.json` in production (default: enabled).
 
-CORS is same-origin by default when requests enter through nginx on port 2026. Split-origin or port-forwarded browser clients must opt in with `GATEWAY_CORS_ORIGINS` (comma-separated exact origins); Gateway `CORSMiddleware` and `CSRFMiddleware` both read that variable so browser CORS and auth-origin checks stay aligned.
-
 **Routers**:
 
 | Router | Endpoints |
@@ -237,33 +223,27 @@ CORS is same-origin by default when requests enter through nginx on port 2026. S
 | **Feedback** (`/api/threads/{id}/runs/{rid}/feedback`) | `PUT /` - upsert feedback; `DELETE /` - delete user feedback; `POST /` - create feedback; `GET /` - list feedback; `GET /stats` - aggregate stats; `DELETE /{fid}` - delete specific |
 | **Runs** (`/api/runs`) | `POST /stream` - stateless run + SSE; `POST /wait` - stateless run + block; `GET /{rid}/messages` - paginated messages by run_id `{data, has_more}` (cursor: `after_seq`/`before_seq`); `GET /{rid}/feedback` - list feedback by run_id |
 
-**RunManager / RunStore contract**:
+Proxied through nginx: `/api/langgraph/*` → LangGraph, all other `/api/*` → Gateway.
-- `RunManager.get()` is async; direct callers must `await` it.
-- When a persistent `RunStore` is configured, `get()` and `list_by_thread()` hydrate historical runs from the store. In-memory records win for the same `run_id` so task, abort, and stream-control state stays attached to active local runs.
-- `cancel()` and `create_or_reject(..., multitask_strategy="interrupt"|"rollback")` persist interrupted status through `RunStore.update_status()`, matching normal `set_status()` transitions.
-- Store-only hydrated runs are readable history. If the current worker has no in-memory task/control state for that run, cancellation APIs can return 409 because this worker cannot stop the task.
-
-Proxied through nginx: `/api/langgraph/*` → Gateway LangGraph-compatible runtime, all other `/api/*` → Gateway REST APIs.
 
 ### Sandbox System (`packages/harness/deerflow/sandbox/`)
 
 **Interface**: Abstract `Sandbox` with `execute_command`, `read_file`, `write_file`, `list_dir`
-**Provider Pattern**: `SandboxProvider` with `acquire`, `acquire_async`, `get`, `release` lifecycle. Async agent/tool paths call async sandbox lifecycle hooks so Docker sandbox creation, discovery, cross-process locking, readiness polling, and release stay off the event loop.
+**Provider Pattern**: `SandboxProvider` with `acquire`, `get`, `release` lifecycle
 **Implementations**:
-- `LocalSandboxProvider` - Local filesystem execution. `acquire(thread_id)` returns a per-thread `LocalSandbox` (id `local:{thread_id}`) whose `path_mappings` resolve `/mnt/user-data/{workspace,uploads,outputs}` and `/mnt/acp-workspace` to that thread's host directories, so the public `Sandbox` API honours the `/mnt/user-data` contract uniformly with AIO. `acquire()` / `acquire(None)` keeps the legacy generic singleton (id `local`) for callers without a thread context. Per-thread sandboxes are held in an LRU cache (default 256 entries) guarded by a `threading.Lock`.
+- `LocalSandboxProvider` - Singleton local filesystem execution with path mappings
 - `AioSandboxProvider` (`packages/harness/deerflow/community/`) - Docker-based isolation
 
 **Virtual Path System**:
 - Agent sees: `/mnt/user-data/{workspace,uploads,outputs}`, `/mnt/skills`
 - Physical: `backend/.deer-flow/users/{user_id}/threads/{thread_id}/user-data/...`, `deer-flow/skills/`
-- Translation: `LocalSandboxProvider` builds per-thread `PathMapping`s for the user-data prefixes at acquire time; `tools.py` keeps `replace_virtual_path()` / `replace_virtual_paths_in_command()` as a defense-in-depth layer (and for path validation). AIO has the directories volume-mounted at the same virtual paths inside its container, so both implementations accept `/mnt/user-data/...` natively.
+- Translation: `replace_virtual_path()` / `replace_virtual_paths_in_command()`
-- Detection: `is_local_sandbox()` accepts both `sandbox_id == "local"` (legacy / no-thread) and `sandbox_id.startswith("local:")` (per-thread)
+- Detection: `is_local_sandbox()` checks `sandbox_id == "local"`
 
 **Sandbox Tools** (in `packages/harness/deerflow/sandbox/tools.py`):
 - `bash` - Execute commands with path translation and error handling
 - `ls` - Directory listing (tree format, max 2 levels)
 - `read_file` - Read file contents with optional line range
-- `write_file` - Write/append to files, creates directories; overwrites by default and exposes the `append` argument in the model-facing schema for end-of-file writes
+- `write_file` - Write/append to files, creates directories
 - `str_replace` - Substring replacement (single or all occurrences); same-path serialization is scoped to `(sandbox.id, path)` so isolated sandboxes do not contend on identical virtual paths inside one process
 
 ### Subagent System (`packages/harness/deerflow/subagents/`)
@@ -409,24 +389,6 @@ Focused regression coverage for the updater lives in `backend/tests/test_memory_
 - `resolve_variable(path)` - Import module and return variable (e.g., `module.path:variable_name`)
 - `resolve_class(path, base_class)` - Import and validate class against base class
 
-### Tracing System (`packages/harness/deerflow/tracing/`)
-
-LangSmith and Langfuse are both supported. The wiring lives in two layers:
-
-- `factory.py::build_tracing_callbacks()` — returns the LangChain `CallbackHandler` list for the providers currently enabled via env vars (`LANGSMITH_TRACING`, `LANGFUSE_TRACING`, etc.). The handlers are attached at the **graph invocation root** for in-graph runs (`make_lead_agent` and `DeerFlowClient.stream` both append them to `config["callbacks"]` before invoking the graph) so a single run produces one trace with all node / LLM / tool calls as child spans. Standalone callers — anything that invokes a model outside such a graph (e.g. `MemoryUpdater`) — keep `create_chat_model`'s default `attach_tracing=True`, which falls back to model-level callback attachment.
-- `metadata.py::build_langfuse_trace_metadata()` — builds the Langfuse-reserved trace attributes for `RunnableConfig.metadata`. The Langfuse v4 `langchain.CallbackHandler` lifts these onto the root trace (see its `_parse_langfuse_trace_attributes`), but only when it sees `on_chain_start(parent_run_id=None)` — which is why the callbacks have to live at the graph root, not the model.
-
-**Trace-attribute injection points**: both `runtime/runs/worker.py::run_agent` (gateway path) and `client.py::DeerFlowClient.stream` (embedded path) merge the metadata into `config["metadata"]` right before constructing the graph. Caller-supplied keys win via `setdefault`, so an external `session_id` override is preserved. Field mapping:
-
-| Langfuse field         | Source                                       |
-|-----------------------|----------------------------------------------|
-| `langfuse_session_id` | LangGraph `thread_id`                         |
-| `langfuse_user_id`    | `get_effective_user_id()` (`default` in no-auth) |
-| `langfuse_trace_name` | `RunRecord.assistant_id` / client `agent_name` (defaults to `lead-agent`) |
-| `langfuse_tags`       | `env:<DEER_FLOW_ENV>` + `model:<model_name>`  |
-
-Returns `{}` when Langfuse is not in the enabled providers — LangSmith-only deployments are unaffected. Set `DEER_FLOW_ENV` (or `ENVIRONMENT`) to tag traces by deployment environment. Tests live in `tests/test_tracing_factory.py`, `tests/test_tracing_metadata.py`, `tests/test_worker_langfuse_metadata.py`, and `tests/test_client_langfuse_metadata.py`.
-
 ### Config Schema
 
 **`config.yaml`** key sections:

backend/CONTRIBUTING.md

@@ -56,8 +56,11 @@ export OPENAI_API_KEY="your-api-key"
 ### Run the Development Server
 
 ```bash
-# Gateway API + embedded agent runtime
+# Terminal 1: LangGraph server
 make dev
+
+# Terminal 2: Gateway API
+make gateway
 ```
 
 ## Project Structure

backend/Makefile

@@ -2,13 +2,13 @@ install:
 	uv sync
 
 dev:
-	PYTHONPATH=. PYTHONIOENCODING=utf-8 PYTHONUTF8=1 uv run uvicorn app.gateway.app:app --host 0.0.0.0 --port 8001 --reload
+	PYTHONPATH=. uv run uvicorn app.gateway.app:app --host 0.0.0.0 --port 8001 --reload
 
 gateway:
-	PYTHONPATH=. PYTHONIOENCODING=utf-8 PYTHONUTF8=1 uv run uvicorn app.gateway.app:app --host 0.0.0.0 --port 8001
+	PYTHONPATH=. uv run uvicorn app.gateway.app:app --host 0.0.0.0 --port 8001
 
 test:
-	PYTHONPATH=. PYTHONIOENCODING=utf-8 PYTHONUTF8=1 uv run pytest tests/ -v
+	PYTHONPATH=. uv run pytest tests/ -v
 
 lint:
 	uvx ruff check .

backend/README.md

@@ -11,26 +11,31 @@ DeerFlow is a LangGraph-based AI super agent with sandbox execution, persistent
                         │          Nginx (Port 2026)           │
                         │      Unified reverse proxy           │
                         └───────┬──────────────────┬───────────┘
-                                │
-            /api/langgraph/*    │    /api/* (other)
-            rewritten to /api/* │
-                                ▼
-               ┌────────────────────────────────────────┐
-               │        Gateway API (8001)              │
-               │        FastAPI REST + agent runtime    │
                                 │                  │
-               │ Models, MCP, Skills, Memory, Uploads,  │
+              /api/langgraph/*  │                  │  /api/* (other)
-               │ Artifacts, Threads, Runs, Streaming    │
+                                ▼                  ▼
-               │                                        │
+               ┌────────────────────┐  ┌────────────────────────┐
-               │ ┌────────────────────────────────────┐ │
+               │ LangGraph Server   │  │   Gateway API (8001)   │
-               │ │ Lead Agent                         │ │
+               │    (Port 2024)     │  │   FastAPI REST         │
-               │ │ Middleware Chain, Tools, Subagents │ │
+               │                    │  │                        │
-               │ └────────────────────────────────────┘ │
+               │ ┌────────────────┐ │  │ Models, MCP, Skills,   │
-               └────────────────────────────────────────┘
+               │ │  Lead Agent    │ │  │ Memory, Uploads,       │
+               │ │  ┌──────────┐  │ │  │ Artifacts              │
+               │ │  │Middleware│  │ │  └────────────────────────┘
+               │ │  │  Chain   │  │ │
+               │ │  └──────────┘  │ │
+               │ │  ┌──────────┐  │ │
+               │ │  │  Tools   │  │ │
+               │ │  └──────────┘  │ │
+               │ │  ┌──────────┐  │ │
+               │ │  │Subagents │  │ │
+               │ │  └──────────┘  │ │
+               │ └────────────────┘ │
+               └────────────────────┘
 ```
 
 **Request Routing** (via Nginx):
-- `/api/langgraph/*` → Gateway LangGraph-compatible API - agent interactions, threads, streaming
+- `/api/langgraph/*` → LangGraph Server - agent interactions, threads, streaming
 - `/api/*` (other) → Gateway API - models, MCP, skills, memory, artifacts, uploads, thread-local cleanup
 - `/` (non-API) → Frontend - Next.js web interface
 
@@ -69,12 +74,12 @@ Middlewares execute in strict order, each handling a specific concern:
 Per-thread isolated execution with virtual path translation:
 
 - **Abstract interface**: `execute_command`, `read_file`, `write_file`, `list_dir`
-- **Providers**: `LocalSandboxProvider` (filesystem) and `AioSandboxProvider` (Docker, in community/). Async runtime paths use async sandbox lifecycle hooks so startup, readiness polling, and release do not block the event loop.
+- **Providers**: `LocalSandboxProvider` (filesystem) and `AioSandboxProvider` (Docker, in community/)
 - **Virtual paths**: `/mnt/user-data/{workspace,uploads,outputs}` → thread-specific physical directories
 - **Skills path**: `/mnt/skills` → `deer-flow/skills/` directory
 - **Skills loading**: Recursively discovers nested `SKILL.md` files under `skills/{public,custom}` and preserves nested container paths
 - **File-write safety**: `str_replace` serializes read-modify-write per `(sandbox.id, path)` so isolated sandboxes keep concurrency even when virtual paths match
-- **Tools**: `bash`, `ls`, `read_file`, `write_file`, `str_replace` (`write_file` overwrites by default and exposes `append` for end-of-file writes; `bash` is disabled by default when using `LocalSandboxProvider`; use `AioSandboxProvider` for isolated shell access)
+- **Tools**: `bash`, `ls`, `read_file`, `write_file`, `str_replace` (`bash` is disabled by default when using `LocalSandboxProvider`; use `AioSandboxProvider` for isolated shell access)
 
 ### Subagent System
 
@@ -188,7 +193,7 @@ export OPENAI_API_KEY="your-api-key-here"
 **Full Application** (from project root):
 
 ```bash
-make dev  # Starts Gateway + Frontend + Nginx
+make dev  # Starts LangGraph + Gateway + Frontend + Nginx
 ```
 
 Access at: http://localhost:2026
@@ -196,11 +201,14 @@ Access at: http://localhost:2026
 **Backend Only** (from backend directory):
 
 ```bash
-# Gateway API + embedded agent runtime
+# Terminal 1: LangGraph server
 make dev
+
+# Terminal 2: Gateway API
+make gateway
 ```
 
-Direct access: Gateway at http://localhost:8001
+Direct access: LangGraph at http://localhost:2024, Gateway at http://localhost:8001
 
 ---
 
@@ -236,16 +244,12 @@ backend/
 │   └── utils/                  # Utilities
 ├── docs/                       # Documentation
 ├── tests/                      # Test suite
-├── langgraph.json              # LangGraph graph registry for tooling/Studio compatibility
+├── langgraph.json              # LangGraph server configuration
 ├── pyproject.toml              # Python dependencies
 ├── Makefile                    # Development commands
 └── Dockerfile                  # Container build
 ```
 
-`langgraph.json` is not the default service entrypoint.  The scripts and Docker
-deployments run the Gateway embedded runtime; the file is kept for LangGraph
-tooling, Studio, or direct LangGraph Server compatibility.
-
 ---
 
 ## Configuration
@@ -358,8 +362,8 @@ If a provider is explicitly enabled but required credentials are missing, or the
 
 ```bash
 make install    # Install dependencies
-make dev        # Run Gateway API + embedded agent runtime (port 8001)
+make dev        # Run LangGraph server (port 2024)
-make gateway    # Run Gateway API without reload (port 8001)
+make gateway    # Run Gateway API (port 8001)
 make lint       # Run linter (ruff)
 make format     # Format code (ruff)
 ```

backend/app/channels/discord.py

@@ -3,10 +3,8 @@
 from __future__ import annotations
 
 import asyncio
-import json
 import logging
 import threading
-from pathlib import Path
 from typing import Any
 
 from app.channels.base import Channel
@@ -23,12 +21,6 @@ class DiscordChannel(Channel):
     Configuration keys (in ``config.yaml`` under ``channels.discord``):
         - ``bot_token``: Discord Bot token.
         - ``allowed_guilds``: (optional) List of allowed Discord guild IDs. Empty = allow all.
-        - ``mention_only``: (optional) If true, only respond when the bot is mentioned.
-        - ``allowed_channels``: (optional) List of channel IDs where messages are always accepted
-          (even when mention_only is true). Use for channels where you want the bot to respond
-          without mentions. Empty = mention_only applies everywhere.
-        - ``thread_mode``: (optional) If true, group a channel conversation into a thread.
-          Default: same as ``mention_only``.
     """
 
     def __init__(self, bus: MessageBus, config: dict[str, Any]) -> None:
@@ -40,29 +32,6 @@ class DiscordChannel(Channel):
                 self._allowed_guilds.add(int(guild_id))
             except (TypeError, ValueError):
                 continue
-        self._mention_only: bool = bool(config.get("mention_only", False))
-        self._thread_mode: bool = config.get("thread_mode", self._mention_only)
-        self._allowed_channels: set[str] = set()
-        for channel_id in config.get("allowed_channels", []):
-            self._allowed_channels.add(str(channel_id))
-
-        # Session tracking: channel_id -> Discord thread_id (in-memory, persisted to JSON).
-        # Uses a dedicated JSON file separate from ChannelStore, which maps IM
-        # conversations to DeerFlow thread IDs — a different concern.
-        self._active_threads: dict[str, str] = {}
-        # Reverse-lookup set for O(1) thread ID checks (avoids O(n) scan of _active_threads.values()).
-        self._active_thread_ids: set[str] = set()
-        # Lock protecting _active_threads and the JSON file from concurrent access.
-        # _run_client (Discord loop thread) and the main thread both read/write.
-        self._thread_store_lock = threading.Lock()
-        store = config.get("channel_store")
-        if store is not None:
-            self._thread_store_path = store._path.parent / "discord_threads.json"
-        else:
-            self._thread_store_path = Path.home() / ".deer-flow" / "channels" / "discord_threads.json"
-
-        # Typing indicator management
-        self._typing_tasks: dict[str, asyncio.Task] = {}
 
         self._client = None
         self._thread: threading.Thread | None = None
@@ -106,56 +75,12 @@ class DiscordChannel(Channel):
 
         self._thread = threading.Thread(target=self._run_client, daemon=True)
         self._thread.start()
-        self._load_active_threads()
         logger.info("Discord channel started")
 
-    def _load_active_threads(self) -> None:
-        """Restore Discord thread mappings from the dedicated JSON file on startup."""
-        with self._thread_store_lock:
-            try:
-                if not self._thread_store_path.exists():
-                    logger.debug("[Discord] no thread mappings file at %s", self._thread_store_path)
-                    return
-                data = json.loads(self._thread_store_path.read_text())
-                self._active_threads.clear()
-                self._active_thread_ids.clear()
-                for channel_id, thread_id in data.items():
-                    self._active_threads[channel_id] = thread_id
-                    self._active_thread_ids.add(thread_id)
-                if self._active_threads:
-                    logger.info("[Discord] restored %d thread mappings from %s", len(self._active_threads), self._thread_store_path)
-            except Exception:
-                logger.exception("[Discord] failed to load thread mappings")
-
-    def _save_thread(self, channel_id: str, thread_id: str) -> None:
-        """Persist a Discord thread mapping to the dedicated JSON file."""
-        with self._thread_store_lock:
-            try:
-                data: dict[str, str] = {}
-                if self._thread_store_path.exists():
-                    data = json.loads(self._thread_store_path.read_text())
-                old_id = data.get(channel_id)
-                data[channel_id] = thread_id
-                # Update reverse-lookup set
-                if old_id:
-                    self._active_thread_ids.discard(old_id)
-                self._active_thread_ids.add(thread_id)
-                self._thread_store_path.parent.mkdir(parents=True, exist_ok=True)
-                self._thread_store_path.write_text(json.dumps(data, indent=2))
-            except Exception:
-                logger.exception("[Discord] failed to save thread mapping for channel %s", channel_id)
-
     async def stop(self) -> None:
         self._running = False
         self.bus.unsubscribe_outbound(self._on_outbound)
 
-        # Cancel all active typing indicator tasks
-        for target_id, task in list(self._typing_tasks.items()):
-            if not task.done():
-                task.cancel()
-            logger.debug("[Discord] cancelled typing task for target %s", target_id)
-        self._typing_tasks.clear()
-
         if self._client and self._discord_loop and self._discord_loop.is_running():
             close_future = asyncio.run_coroutine_threadsafe(self._client.close(), self._discord_loop)
             try:
@@ -175,10 +100,6 @@ class DiscordChannel(Channel):
         logger.info("Discord channel stopped")
 
     async def send(self, msg: OutboundMessage) -> None:
-        # Stop typing indicator once we're sending the response
-        stop_future = asyncio.run_coroutine_threadsafe(self._stop_typing(msg.chat_id, msg.thread_ts), self._discord_loop)
-        await asyncio.wrap_future(stop_future)
-
         target = await self._resolve_target(msg)
         if target is None:
             logger.error("[Discord] target not found for chat_id=%s thread_ts=%s", msg.chat_id, msg.thread_ts)
@@ -190,9 +111,6 @@ class DiscordChannel(Channel):
             await asyncio.wrap_future(send_future)
 
     async def send_file(self, msg: OutboundMessage, attachment: ResolvedAttachment) -> bool:
-        stop_future = asyncio.run_coroutine_threadsafe(self._stop_typing(msg.chat_id, msg.thread_ts), self._discord_loop)
-        await asyncio.wrap_future(stop_future)
-
         target = await self._resolve_target(msg)
         if target is None:
             logger.error("[Discord] target not found for file upload chat_id=%s thread_ts=%s", msg.chat_id, msg.thread_ts)
@@ -212,41 +130,6 @@ class DiscordChannel(Channel):
             logger.exception("[Discord] failed to upload file: %s", attachment.filename)
             return False
 
-    async def _start_typing(self, channel, chat_id: str, thread_ts: str | None = None) -> None:
-        """Starts a loop to send periodic typing indicators."""
-        target_id = thread_ts or chat_id
-        if target_id in self._typing_tasks:
-            return  # Already typing for this target
-
-        async def _typing_loop():
-            try:
-                while True:
-                    try:
-                        await channel.trigger_typing()
-                    except Exception:
-                        pass
-                    await asyncio.sleep(10)
-            except asyncio.CancelledError:
-                pass
-
-        task = asyncio.create_task(_typing_loop())
-        self._typing_tasks[target_id] = task
-
-    async def _stop_typing(self, chat_id: str, thread_ts: str | None = None) -> None:
-        """Stops the typing loop for a specific target."""
-        target_id = thread_ts or chat_id
-        task = self._typing_tasks.pop(target_id, None)
-        if task and not task.done():
-            task.cancel()
-            logger.debug("[Discord] stopped typing indicator for target %s", target_id)
-
-    async def _add_reaction(self, message) -> None:
-        """Add a checkmark reaction to acknowledge the message was received."""
-        try:
-            await message.add_reaction("✅")
-        except Exception:
-            logger.debug("[Discord] failed to add reaction to message %s", message.id, exc_info=True)
-
     async def _on_message(self, message) -> None:
         if not self._running or not self._client:
             return
@@ -269,143 +152,15 @@ class DiscordChannel(Channel):
         if self._discord_module is None:
             return
 
-        # Determine whether the bot is mentioned in this message
-        user = self._client.user if self._client else None
-        if user:
-            bot_mention = user.mention  # <@ID>
-            alt_mention = f"<@!{user.id}>"  # <@!ID> (ping variant)
-            standard_mention = f"<@{user.id}>"
-        else:
-            bot_mention = None
-            alt_mention = None
-            standard_mention = ""
-        has_mention = (bot_mention and bot_mention in message.content) or (alt_mention and alt_mention in message.content) or (standard_mention and standard_mention in message.content)
-
-        # Strip mention from text for processing
-        if has_mention:
-            text = text.replace(bot_mention or "", "").replace(alt_mention or "", "").replace(standard_mention or "", "").strip()
-            # Don't return early if text is empty — still process the mention (e.g., create thread)
-
-        # --- Determine thread/channel routing and typing target ---
-        thread_id = None
-        chat_id = None
-        typing_target = None  # The Discord object to type into
-
         if isinstance(message.channel, self._discord_module.Thread):
-            # --- Message already inside a thread ---
+            chat_id = str(message.channel.parent_id or message.channel.id)
-            thread_obj = message.channel
+            thread_id = str(message.channel.id)
-            thread_id = str(thread_obj.id)
+        else:
-            chat_id = str(thread_obj.parent_id or thread_obj.id)
+            thread = await self._create_thread(message)
-            typing_target = thread_obj
+            if thread is None:
-
-            # If this is a known active thread, process normally
-            if thread_id in self._active_thread_ids:
-                msg_type = InboundMessageType.COMMAND if text.startswith("/") else InboundMessageType.CHAT
-                inbound = self._make_inbound(
-                    chat_id=chat_id,
-                    user_id=str(message.author.id),
-                    text=text,
-                    msg_type=msg_type,
-                    thread_ts=thread_id,
-                    metadata={
-                        "guild_id": str(guild.id) if guild else None,
-                        "channel_id": str(message.channel.id),
-                        "message_id": str(message.id),
-                    },
-                )
-                inbound.topic_id = thread_id
-                self._publish(inbound)
-                # Start typing indicator in the thread
-                if typing_target:
-                    asyncio.create_task(self._start_typing(typing_target, chat_id, thread_id))
-                asyncio.create_task(self._add_reaction(message))
                 return
-
+            chat_id = str(message.channel.id)
-            # Thread not tracked (orphaned) — create new thread and handle below
+            thread_id = str(thread.id)
-            logger.debug("[Discord] message in orphaned thread %s, will create new thread", thread_id)
-            thread_id = None
-            typing_target = None
-
-        # At this point we're guaranteed to be in a channel, not a thread
-        # (the Thread case is handled above). Apply mention_only for all
-        # non-thread messages — no special case needed.
-        channel_id = str(message.channel.id)
-
-        # Check if there's an active thread for this channel
-        if channel_id in self._active_threads:
-            # respect mention_only: if enabled, only process messages that mention the bot
-            # (unless the channel is in allowed_channels)
-            # Messages within a thread are always allowed through (continuation).
-            # At this code point we know the message is in a channel, not a thread
-            # (Thread case handled above), so always apply the check.
-            if self._mention_only and not has_mention and channel_id not in self._allowed_channels:
-                logger.debug("[Discord] skipping no-@ message in channel %s (not in thread)", channel_id)
-                return
-            # mention_only + fresh @ → create new thread instead of routing to existing one
-            if self._mention_only and has_mention:
-                thread_obj = await self._create_thread(message)
-                if thread_obj is not None:
-                    target_thread_id = str(thread_obj.id)
-                    self._active_threads[channel_id] = target_thread_id
-                    self._save_thread(channel_id, target_thread_id)
-                    thread_id = target_thread_id
-                    chat_id = channel_id
-                    typing_target = thread_obj
-                    logger.info("[Discord] created new thread %s in channel %s on mention (replacing existing thread)", target_thread_id, channel_id)
-                else:
-                    logger.info("[Discord] thread creation failed in channel %s, falling back to channel replies", channel_id)
-                    thread_id = channel_id
-                    chat_id = channel_id
-                    typing_target = message.channel
-            else:
-                # Existing session → route to the existing thread
-                target_thread_id = self._active_threads[channel_id]
-                logger.debug("[Discord] routing message in channel %s to existing thread %s", channel_id, target_thread_id)
-                thread_id = target_thread_id
-                chat_id = channel_id
-                typing_target = await self._get_channel_or_thread(target_thread_id)
-        elif self._mention_only and not has_mention and channel_id not in self._allowed_channels:
-            # Not mentioned and not in an allowed channel → skip
-            logger.debug("[Discord] skipping message without mention in channel %s", channel_id)
-            return
-        elif self._mention_only and has_mention:
-            # First mention in this channel → create thread
-            thread_obj = await self._create_thread(message)
-            if thread_obj is not None:
-                target_thread_id = str(thread_obj.id)
-                self._active_threads[channel_id] = target_thread_id
-                self._save_thread(channel_id, target_thread_id)
-                thread_id = target_thread_id
-                chat_id = channel_id
-                typing_target = thread_obj  # Type into the new thread
-                logger.info("[Discord] created thread %s in channel %s for user %s", target_thread_id, channel_id, message.author.display_name)
-            else:
-                # Fallback: thread creation failed (disabled/permissions), reply in channel
-                logger.info("[Discord] thread creation failed in channel %s, falling back to channel replies", channel_id)
-                thread_id = channel_id
-                chat_id = channel_id
-                typing_target = message.channel  # Type into the channel
-        elif self._thread_mode:
-            # thread_mode but mention_only is False → create thread anyway for conversation grouping
-            thread_obj = await self._create_thread(message)
-            if thread_obj is None:
-                # Thread creation failed (disabled/permissions), fall back to channel replies
-                logger.info("[Discord] thread creation failed in channel %s, falling back to channel replies", channel_id)
-                thread_id = channel_id
-                chat_id = channel_id
-                typing_target = message.channel  # Type into the channel
-            else:
-                target_thread_id = str(thread_obj.id)
-                self._active_threads[channel_id] = target_thread_id
-                self._save_thread(channel_id, target_thread_id)
-                thread_id = target_thread_id
-                chat_id = channel_id
-                typing_target = thread_obj  # Type into the new thread
-        else:
-            # No threading — reply directly in channel
-            thread_id = channel_id
-            chat_id = channel_id
-            typing_target = message.channel  # Type into the channel
 
         msg_type = InboundMessageType.COMMAND if text.startswith("/") else InboundMessageType.CHAT
         inbound = self._make_inbound(
@@ -422,15 +177,6 @@ class DiscordChannel(Channel):
         )
         inbound.topic_id = thread_id
 
-        # Start typing indicator in the correct target (thread or channel)
-        if typing_target:
-            asyncio.create_task(self._start_typing(typing_target, chat_id, thread_id))
-
-        self._publish(inbound)
-        asyncio.create_task(self._add_reaction(message))
-
-    def _publish(self, inbound) -> None:
-        """Publish an inbound message to the main event loop."""
         if self._main_loop and self._main_loop.is_running():
             future = asyncio.run_coroutine_threadsafe(self.bus.publish_inbound(inbound), self._main_loop)
             future.add_done_callback(lambda f: logger.exception("[Discord] publish_inbound failed", exc_info=f.exception()) if f.exception() else None)
@@ -452,40 +198,14 @@ class DiscordChannel(Channel):
 
     async def _create_thread(self, message):
         try:
-            if self._discord_module is None:
-                return None
-
-            # Only TextChannel (type 0) and NewsChannel (type 10) support threads
-            channel_type = message.channel.type
-            if channel_type not in (
-                self._discord_module.ChannelType.text,
-                self._discord_module.ChannelType.news,
-            ):
-                logger.info(
-                    "[Discord] channel type %s (%s) does not support threads",
-                    channel_type.value,
-                    channel_type.name,
-                )
-                return None
-
             thread_name = f"deerflow-{message.author.display_name}-{message.id}"[:100]
             return await message.create_thread(name=thread_name)
-        except self._discord_module.errors.HTTPException as exc:
-            if exc.code == 50024:
-                logger.info(
-                    "[Discord] cannot create thread in channel %s (error code 50024): %s",
-                    message.channel.id,
-                    channel_type.name if (channel_type := message.channel.type) else "unknown",
-                )
-            else:
-                logger.exception(
-                    "[Discord] failed to create thread for message=%s (HTTPException %s)",
-                    message.id,
-                    exc.code,
-                )
-            return None
         except Exception:
             logger.exception("[Discord] failed to create thread for message=%s (threads may be disabled or missing permissions)", message.id)
+            try:
+                await message.channel.send("Could not create a thread for your message. Please check that threads are enabled in this channel.")
+            except Exception:
+                pass
             return None
 
     async def _resolve_target(self, msg: OutboundMessage):

backend/app/channels/manager.py

@@ -146,6 +146,13 @@ def _normalize_custom_agent_name(raw_value: str) -> str:
     return normalized
 
 
+def _strip_loop_warning_text(text: str) -> str:
+    """Remove middleware-authored loop warning lines from display text."""
+    if "[LOOP DETECTED]" not in text:
+        return text
+    return "\n".join(line for line in text.splitlines() if "[LOOP DETECTED]" not in line).strip()
+
+
 def _extract_response_text(result: dict | list) -> str:
     """Extract the last AI message text from a LangGraph runs.wait result.
 
@@ -155,6 +162,7 @@ def _extract_response_text(result: dict | list) -> str:
     Handles special cases:
     - Regular AI text responses
     - Clarification interrupts (``ask_clarification`` tool messages)
+    - Strips loop-detection warnings attached to tool-call AI messages
     """
     if isinstance(result, list):
         messages = result
@@ -184,7 +192,12 @@ def _extract_response_text(result: dict | list) -> str:
         # Regular AI message with text content
         if msg_type == "ai":
             content = msg.get("content", "")
+            has_tool_calls = bool(msg.get("tool_calls"))
             if isinstance(content, str) and content:
+                if has_tool_calls:
+                    content = _strip_loop_warning_text(content)
+                    if not content:
+                        continue
                 return content
             # content can be a list of content blocks
             if isinstance(content, list):
@@ -195,6 +208,8 @@ def _extract_response_text(result: dict | list) -> str:
                     elif isinstance(block, str):
                         parts.append(block)
                 text = "".join(parts)
+                if has_tool_calls:
+                    text = _strip_loop_warning_text(text)
                 if text:
                     return text
     return ""
@@ -772,22 +787,13 @@ class ChannelManager:
             return
 
         logger.info("[Manager] invoking runs.wait(thread_id=%s, text=%r)", thread_id, msg.text[:100])
-        try:
         result = await client.runs.wait(
             thread_id,
             assistant_id,
             input={"messages": [{"role": "human", "content": msg.text}]},
             config=run_config,
             context=run_context,
-                multitask_strategy="reject",
         )
-        except Exception as exc:
-            if _is_thread_busy_error(exc):
-                logger.warning("[Manager] thread busy (concurrent run rejected): thread_id=%s", thread_id)
-                await self._send_error(msg, THREAD_BUSY_MESSAGE)
-                return
-            else:
-                raise
 
         response_text = _extract_response_text(result)
         artifacts = _extract_artifacts(result)

backend/app/channels/service.py

@@ -167,8 +167,6 @@ class ChannelService:
             return False
 
         try:
-            config = dict(config)
-            config["channel_store"] = self.store
             channel = channel_cls(bus=self.bus, config=config)
             self._channels[name] = channel
             await channel.start()

backend/app/gateway/app.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import os
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
@@ -8,7 +9,7 @@ from fastapi.middleware.cors import CORSMiddleware
 
 from app.gateway.auth_middleware import AuthMiddleware
 from app.gateway.config import get_gateway_config
-from app.gateway.csrf_middleware import CSRFMiddleware, get_configured_cors_origins
+from app.gateway.csrf_middleware import CSRFMiddleware
 from app.gateway.deps import langgraph_runtime
 from app.gateway.routers import (
     agents,
@@ -62,7 +63,7 @@ async def _ensure_admin_user(app: FastAPI) -> None:
 
     Subsequent boots (admin already exists):
       - Runs the one-time "no-auth → with-auth" orphan thread migration for
-        existing LangGraph thread metadata that has no user_id.
+        existing LangGraph thread metadata that has no owner_id.
 
     No SQL persistence migration is needed: the four user_id columns
     (threads_meta, runs, run_events, feedback) only come into existence
@@ -161,16 +162,10 @@ async def _migrate_orphaned_threads(store, admin_user_id: str) -> int:
 async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
     """Application lifespan handler."""
 
-    # Load config and check necessary environment variables at startup.
+    # Load config and check necessary environment variables at startup
-    # `startup_config` is a local snapshot used only for one-shot bootstrap
-    # work (logging level, langgraph_runtime engines, channels). Request-time
-    # config resolution always routes through `get_app_config()` in
-    # `app/gateway/deps.py::get_config()` so `config.yaml` edits become
-    # visible without a process restart. We deliberately do NOT cache this
-    # snapshot on `app.state` to keep that contract enforceable.
     try:
-        startup_config = get_app_config()
+        app.state.config = get_app_config()
-        apply_logging_level(startup_config.log_level)
+        apply_logging_level(app.state.config.log_level)
         logger.info("Configuration loaded successfully")
     except Exception as e:
         error_msg = f"Failed to load configuration during gateway startup: {e}"
@@ -180,10 +175,10 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
     logger.info(f"Starting API Gateway on {config.host}:{config.port}")
 
     # Initialize LangGraph runtime components (StreamBridge, RunManager, checkpointer, store)
-    async with langgraph_runtime(app, startup_config):
+    async with langgraph_runtime(app):
         logger.info("LangGraph runtime initialised")
 
-        # Check admin bootstrap state and migrate orphan threads after admin exists.
+        # Ensure admin user exists (auto-create on first boot)
         # Must run AFTER langgraph_runtime so app.state.store is available for thread migration
         await _ensure_admin_user(app)
 
@@ -191,7 +186,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
         try:
             from app.channels.service import start_channel_service
 
-            channel_service = await start_channel_service(startup_config)
+            channel_service = await start_channel_service(app.state.config)
             logger.info("Channel service started: %s", channel_service.get_status())
         except Exception:
             logger.exception("No IM channels configured or channel service failed to start")
@@ -224,9 +219,7 @@ def create_app() -> FastAPI:
         Configured FastAPI application instance.
     """
     config = get_gateway_config()
-    docs_url = "/docs" if config.enable_docs else None
+    docs_kwargs = {"docs_url": "/docs", "redoc_url": "/redoc", "openapi_url": "/openapi.json"} if config.enable_docs else {"docs_url": None, "redoc_url": None, "openapi_url": None}
-    redoc_url = "/redoc" if config.enable_docs else None
-    openapi_url = "/openapi.json" if config.enable_docs else None
 
     app = FastAPI(
         title="DeerFlow API Gateway",
@@ -246,14 +239,12 @@ API Gateway for DeerFlow - A LangGraph-based AI agent backend with sandbox execu
 
 ### Architecture
 
-LangGraph-compatible requests are routed through nginx to this gateway.
+LangGraph requests are handled by nginx reverse proxy.
-This gateway provides runtime endpoints for agent runs plus custom endpoints for models, MCP configuration, skills, and artifacts.
+This gateway provides custom endpoints for models, MCP configuration, skills, and artifacts.
         """,
         version="0.1.0",
         lifespan=lifespan,
-        docs_url=docs_url,
+        **docs_kwargs,
-        redoc_url=redoc_url,
-        openapi_url=openapi_url,
         openapi_tags=[
             {
                 "name": "models",
@@ -316,10 +307,17 @@ This gateway provides runtime endpoints for agent runs plus custom endpoints for
     # CSRF: Double Submit Cookie pattern for state-changing requests
     app.add_middleware(CSRFMiddleware)
 
-    # CORS: the unified nginx endpoint is same-origin by default. Split-origin
+    # CORS: when GATEWAY_CORS_ORIGINS is set (dev without nginx), add CORS middleware.
-    # browser clients must opt in with this explicit Gateway allowlist so CORS
+    # In production, nginx handles CORS and no middleware is needed.
-    # and CSRF origin checks share the same source of truth.
+    cors_origins_env = os.environ.get("GATEWAY_CORS_ORIGINS", "")
-    cors_origins = sorted(get_configured_cors_origins())
+    if cors_origins_env:
+        cors_origins = [o.strip() for o in cors_origins_env.split(",") if o.strip()]
+        # Validate: wildcard origin with credentials is a security misconfiguration
+        for origin in cors_origins:
+            if origin == "*":
+                logger.error("GATEWAY_CORS_ORIGINS contains wildcard '*' with allow_credentials=True. This is a security misconfiguration — browsers will reject the response. Use explicit scheme://host:port origins instead.")
+                cors_origins = [o for o in cors_origins if o != "*"]
+                break
         if cors_origins:
             app.add_middleware(
                 CORSMiddleware,
@@ -376,7 +374,7 @@ This gateway provides runtime endpoints for agent runs plus custom endpoints for
     app.include_router(runs.router)
 
     @app.get("/health", tags=["health"])
-    async def health_check() -> dict[str, str]:
+    async def health_check() -> dict:
         """Health check endpoint.
 
         Returns:

backend/app/gateway/auth/config.py

@@ -8,8 +8,6 @@ from pydantic import BaseModel, Field
 
 logger = logging.getLogger(__name__)
 
-_SECRET_FILE = ".jwt_secret"
-
 
 class AuthConfig(BaseModel):
     """JWT and auth-related configuration. Parsed once at startup.
@@ -32,32 +30,6 @@ class AuthConfig(BaseModel):
 _auth_config: AuthConfig | None = None
 
 
-def _load_or_create_secret() -> str:
-    """Load persisted JWT secret from ``{base_dir}/.jwt_secret``, or generate and persist a new one."""
-    from deerflow.config.paths import get_paths
-
-    paths = get_paths()
-    secret_file = paths.base_dir / _SECRET_FILE
-
-    try:
-        if secret_file.exists():
-            secret = secret_file.read_text(encoding="utf-8").strip()
-            if secret:
-                return secret
-    except OSError as exc:
-        raise RuntimeError(f"Failed to read JWT secret from {secret_file}. Set AUTH_JWT_SECRET explicitly or fix DEER_FLOW_HOME/base directory permissions so DeerFlow can read its persisted auth secret.") from exc
-
-    secret = secrets.token_urlsafe(32)
-    try:
-        secret_file.parent.mkdir(parents=True, exist_ok=True)
-        fd = os.open(secret_file, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600)
-        with os.fdopen(fd, "w", encoding="utf-8") as fh:
-            fh.write(secret)
-    except OSError as exc:
-        raise RuntimeError(f"Failed to persist JWT secret to {secret_file}. Set AUTH_JWT_SECRET explicitly or fix DEER_FLOW_HOME/base directory permissions so DeerFlow can store a stable auth secret.") from exc
-    return secret
-
-
 def get_auth_config() -> AuthConfig:
     """Get the global AuthConfig instance. Parses from env on first call."""
     global _auth_config
@@ -67,11 +39,11 @@ def get_auth_config() -> AuthConfig:
         load_dotenv()
         jwt_secret = os.environ.get("AUTH_JWT_SECRET")
         if not jwt_secret:
-            jwt_secret = _load_or_create_secret()
+            jwt_secret = secrets.token_urlsafe(32)
             os.environ["AUTH_JWT_SECRET"] = jwt_secret
             logger.warning(
-                "⚠ AUTH_JWT_SECRET is not set — using an auto-generated secret "
+                "⚠ AUTH_JWT_SECRET is not set — using an auto-generated ephemeral secret. "
-                "persisted to .jwt_secret. Sessions will survive restarts. "
+                "Sessions will be invalidated on restart. "
                 "For production, add AUTH_JWT_SECRET to your .env file: "
                 'python -c "import secrets; print(secrets.token_urlsafe(32))"'
             )

backend/app/gateway/auth/models.py

@@ -28,7 +28,7 @@ class User(BaseModel):
     oauth_id: str | None = Field(None, description="User ID from OAuth provider")
 
     # Auth lifecycle
-    needs_setup: bool = Field(default=False, description="True when a reset account must complete setup")
+    needs_setup: bool = Field(default=False, description="True for auto-created admin until setup completes")
     token_version: int = Field(default=0, description="Incremented on password change to invalidate old JWTs")
 
 

backend/app/gateway/config.py

@@ -8,6 +8,7 @@ class GatewayConfig(BaseModel):
 
     host: str = Field(default="0.0.0.0", description="Host to bind the gateway server")
     port: int = Field(default=8001, description="Port to bind the gateway server")
+    cors_origins: list[str] = Field(default_factory=lambda: ["http://localhost:3000"], description="Allowed CORS origins")
     enable_docs: bool = Field(default=True, description="Enable Swagger/ReDoc/OpenAPI endpoints")
 
 
@@ -18,9 +19,11 @@ def get_gateway_config() -> GatewayConfig:
     """Get gateway config, loading from environment if available."""
     global _gateway_config
     if _gateway_config is None:
+        cors_origins_str = os.getenv("CORS_ORIGINS", "http://localhost:3000")
         _gateway_config = GatewayConfig(
             host=os.getenv("GATEWAY_HOST", "0.0.0.0"),
             port=int(os.getenv("GATEWAY_PORT", "8001")),
+            cors_origins=cors_origins_str.split(","),
             enable_docs=os.getenv("GATEWAY_ENABLE_DOCS", "true").lower() == "true",
         )
     return _gateway_config

backend/app/gateway/csrf_middleware.py

@@ -6,7 +6,7 @@ State-changing operations require CSRF protection.
 
 import os
 import secrets
-from collections.abc import Awaitable, Callable
+from collections.abc import Callable
 from urllib.parse import urlsplit
 
 from fastapi import Request, Response
@@ -106,11 +106,6 @@ def _configured_cors_origins() -> set[str]:
     return origins
 
 
-def get_configured_cors_origins() -> set[str]:
-    """Return normalized explicit browser origins from GATEWAY_CORS_ORIGINS."""
-    return _configured_cors_origins()
-
-
 def _first_header_value(value: str | None) -> str | None:
     """Return the first value from a comma-separated proxy header."""
     if not value:
@@ -177,7 +172,7 @@ class CSRFMiddleware(BaseHTTPMiddleware):
     def __init__(self, app: ASGIApp) -> None:
         super().__init__(app)
 
-    async def dispatch(self, request: Request, call_next: Callable[[Request], Awaitable[Response]]) -> Response:
+    async def dispatch(self, request: Request, call_next: Callable) -> Response:
         _is_auth = is_auth_endpoint(request)
 
         if should_check_csrf(request) and _is_auth and not is_allowed_auth_origin(request):

backend/app/gateway/deps.py

@@ -3,21 +3,11 @@
 **Getters** (used by routers): raise 503 when a required dependency is
 missing, except ``get_store`` which returns ``None``.
 
-``AppConfig`` is intentionally *not* cached on ``app.state``. Routers and the
-run path resolve it through :func:`deerflow.config.app_config.get_app_config`,
-which performs mtime-based hot reload, so edits to ``config.yaml`` take
-effect on the next request without a process restart. The engines created in
-:func:`langgraph_runtime` (stream bridge, persistence, checkpointer, store,
-run-event store) accept a ``startup_config`` snapshot — they are
-restart-required by design and stay bound to that snapshot to keep the live
-process consistent with itself.
-
 Initialization is handled directly in ``app.py`` via :class:`AsyncExitStack`.
 """
 
 from __future__ import annotations
 
-import logging
 from collections.abc import AsyncGenerator, Callable
 from contextlib import AsyncExitStack, asynccontextmanager
 from typing import TYPE_CHECKING, TypeVar, cast
@@ -25,14 +15,12 @@ from typing import TYPE_CHECKING, TypeVar, cast
 from fastapi import FastAPI, HTTPException, Request
 from langgraph.types import Checkpointer
 
-from deerflow.config.app_config import AppConfig, get_app_config
+from deerflow.config.app_config import AppConfig
 from deerflow.persistence.feedback import FeedbackRepository
 from deerflow.runtime import RunContext, RunManager, StreamBridge
 from deerflow.runtime.events.store.base import RunEventStore
 from deerflow.runtime.runs.store.base import RunStore
 
-logger = logging.getLogger(__name__)
-
 if TYPE_CHECKING:
     from app.gateway.auth.local_provider import LocalAuthProvider
     from app.gateway.auth.repositories.sqlite import SQLiteUserRepository
@@ -42,55 +30,21 @@ if TYPE_CHECKING:
 T = TypeVar("T")
 
 
-def get_config() -> AppConfig:
+def get_config(request: Request) -> AppConfig:
-    """Return the freshest ``AppConfig`` for the current request.
+    """Return the app-scoped ``AppConfig`` stored on ``app.state``."""
-
+    config = getattr(request.app.state, "config", None)
-    Routes through :func:`deerflow.config.app_config.get_app_config`, which
+    if config is None:
-    honours runtime ``ContextVar`` overrides and reloads ``config.yaml`` from
+        raise HTTPException(status_code=503, detail="Configuration not available")
-    disk when its mtime changes. ``AppConfig`` is not cached on ``app.state``
+    return config
-    at all — the only startup-time snapshot lives as a local
-    ``startup_config`` variable inside ``lifespan()`` and is passed
-    explicitly into :func:`langgraph_runtime` for the engines that are
-    restart-required by design. Routing every request through
-    :func:`get_app_config` closes the bytedance/deer-flow issue #3107 BUG-001
-    split-brain where the worker / lead-agent thread saw a stale startup
-    snapshot.
-
-    Any failure to materialise the config (missing file, permission denied,
-    YAML parse error, validation error) is reported as 503 — semantically
-    "the gateway cannot serve requests without a usable configuration" — and
-    logged with the original exception so operators have something to debug.
-    """
-    try:
-        return get_app_config()
-    except Exception as exc:  # noqa: BLE001 - request boundary: log and degrade gracefully
-        logger.exception("Failed to load AppConfig at request time")
-        raise HTTPException(status_code=503, detail="Configuration not available") from exc
 
 
 @asynccontextmanager
-async def langgraph_runtime(app: FastAPI, startup_config: AppConfig) -> AsyncGenerator[None, None]:
+async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
     """Bootstrap and tear down all LangGraph runtime singletons.
 
-    ``startup_config`` is the ``AppConfig`` snapshot taken once during
-    ``lifespan()`` for one-shot infrastructure bootstrap. The engines and
-    stores constructed here (stream bridge, persistence engine, checkpointer,
-    store, run-event store) are restart-required by design — they hold live
-    connections, file handles, or singleton providers — so they bind to this
-    snapshot and survive across `config.yaml` edits. Request-time consumers
-    must still go through :func:`get_config` for any field that should be
-    hot-reloadable. See ``backend/CLAUDE.md`` "Config Hot-Reload Boundary".
-
-    The matching ``run_events_config`` is frozen onto ``app.state`` so
-    :func:`get_run_context` pairs a freshly-loaded ``AppConfig`` with the
-    *startup-time* run-events configuration the underlying ``event_store``
-    was built from — otherwise the runtime could end up combining a live
-    new ``run_events_config`` with an event store still bound to the
-    previous backend.
-
     Usage in ``app.py``::
 
-        async with langgraph_runtime(app, startup_config):
+        async with langgraph_runtime(app):
             yield
     """
     from deerflow.persistence.engine import close_engine, get_session_factory, init_engine_from_config
@@ -99,7 +53,9 @@ async def langgraph_runtime(app: FastAPI, startup_config: AppConfig) -> AsyncGen
     from deerflow.runtime.events.store import make_run_event_store
 
     async with AsyncExitStack() as stack:
-        config = startup_config
+        config = getattr(app.state, "config", None)
+        if config is None:
+            raise RuntimeError("langgraph_runtime() requires app.state.config to be initialized")
 
         app.state.stream_bridge = await stack.enter_async_context(make_stream_bridge(config))
 
@@ -128,12 +84,8 @@ async def langgraph_runtime(app: FastAPI, startup_config: AppConfig) -> AsyncGen
 
         app.state.thread_store = make_thread_store(sf, app.state.store)
 
-        # Run event store. The store and the matching ``run_events_config`` are
+        # Run event store (has its own factory with config-driven backend selection)
-        # both frozen at startup so ``get_run_context`` does not combine a
-        # freshly-reloaded ``AppConfig.run_events`` with a store still bound to
-        # the previous backend.
         run_events_config = getattr(config, "run_events", None)
-        app.state.run_events_config = run_events_config
         app.state.run_event_store = make_run_event_store(run_events_config)
 
         # RunManager with store backing for persistence
@@ -187,20 +139,16 @@ def get_thread_store(request: Request) -> ThreadMetaStore:
 def get_run_context(request: Request) -> RunContext:
     """Build a :class:`RunContext` from ``app.state`` singletons.
 
-    Returns a *base* context with infrastructure dependencies. The
+    Returns a *base* context with infrastructure dependencies.
-    ``app_config`` field is resolved live so per-run fields (e.g.
-    ``models[*].max_tokens``) follow ``config.yaml`` edits; the
-    ``event_store`` / ``run_events_config`` pair stays frozen to the snapshot
-    captured in :func:`langgraph_runtime` so callers never see a store bound
-    to one backend paired with a config pointing at another.
     """
+    config = get_config(request)
     return RunContext(
         checkpointer=get_checkpointer(request),
         store=get_store(request),
         event_store=get_run_event_store(request),
-        run_events_config=getattr(request.app.state, "run_events_config", None),
+        run_events_config=getattr(config, "run_events", None),
         thread_store=get_thread_store(request),
-        app_config=get_config(),
+        app_config=config,
     )
 
 

backend/app/gateway/langgraph_auth.py

@@ -1,12 +1,8 @@
-"""LangGraph compatibility auth handler — shares JWT logic with Gateway.
+"""LangGraph Server auth handler — shares JWT logic with Gateway.
 
-The default DeerFlow runtime is embedded in the FastAPI Gateway; scripts and
+Loaded by LangGraph Server via langgraph.json ``auth.path``.
-Docker deployments do not load this module.  It is retained for LangGraph
+Reuses the same ``decode_token`` / ``get_auth_config`` as Gateway,
-tooling, Studio, or direct LangGraph Server compatibility through
+so both modes validate tokens with the same secret and rules.
-``langgraph.json``'s ``auth.path``.
-
-When that compatibility path is used, this module reuses the same JWT and CSRF
-rules as Gateway so both modes validate sessions consistently.
 
 Two layers:
   1. @auth.authenticate — validates JWT cookie, extracts user_id,

backend/app/gateway/routers/artifacts.py

@@ -20,9 +20,6 @@ ACTIVE_CONTENT_MIME_TYPES = {
     "image/svg+xml",
 }
 
-MAX_SKILL_ARCHIVE_MEMBER_BYTES = 16 * 1024 * 1024
-_SKILL_ARCHIVE_READ_CHUNK_SIZE = 64 * 1024
-
 
 def _build_content_disposition(disposition_type: str, filename: str) -> str:
     """Build an RFC 5987 encoded Content-Disposition header value."""
@@ -47,22 +44,6 @@ def is_text_file_by_content(path: Path, sample_size: int = 8192) -> bool:
         return False
 
 
-def _read_skill_archive_member(zip_ref: zipfile.ZipFile, info: zipfile.ZipInfo) -> bytes:
-    """Read a .skill archive member while enforcing an uncompressed size cap."""
-    if info.file_size > MAX_SKILL_ARCHIVE_MEMBER_BYTES:
-        raise HTTPException(status_code=413, detail="Skill archive member is too large to preview")
-
-    chunks: list[bytes] = []
-    total_read = 0
-    with zip_ref.open(info, "r") as src:
-        while chunk := src.read(_SKILL_ARCHIVE_READ_CHUNK_SIZE):
-            total_read += len(chunk)
-            if total_read > MAX_SKILL_ARCHIVE_MEMBER_BYTES:
-                raise HTTPException(status_code=413, detail="Skill archive member is too large to preview")
-            chunks.append(chunk)
-    return b"".join(chunks)
-
-
 def _extract_file_from_skill_archive(zip_path: Path, internal_path: str) -> bytes | None:
     """Extract a file from a .skill ZIP archive.
 
@@ -79,16 +60,16 @@ def _extract_file_from_skill_archive(zip_path: Path, internal_path: str) -> byte
     try:
         with zipfile.ZipFile(zip_path, "r") as zip_ref:
             # List all files in the archive
-            infos_by_name = {info.filename: info for info in zip_ref.infolist()}
+            namelist = zip_ref.namelist()
 
             # Try direct path first
-            if internal_path in infos_by_name:
+            if internal_path in namelist:
-                return _read_skill_archive_member(zip_ref, infos_by_name[internal_path])
+                return zip_ref.read(internal_path)
 
             # Try with any top-level directory prefix (e.g., "skill-name/SKILL.md")
-            for name, info in infos_by_name.items():
+            for name in namelist:
                 if name.endswith("/" + internal_path) or name == internal_path:
-                    return _read_skill_archive_member(zip_ref, info)
+                    return zip_ref.read(name)
 
             # Not found
             return None

backend/app/gateway/routers/auth.py

@@ -1,6 +1,5 @@
 """Authentication endpoints."""
 
-import asyncio
 import logging
 import os
 import time
@@ -306,7 +305,7 @@ async def login_local(
 async def register(request: Request, response: Response, body: RegisterRequest):
     """Register a new user account (always 'user' role).
 
-    The first admin is created explicitly through /initialize. This endpoint creates regular users.
+    Admin is auto-created on first boot. This endpoint creates regular users.
     Auto-login by setting the session cookie.
     """
     try:
@@ -383,15 +382,9 @@ async def get_me(request: Request):
     return UserResponse(id=str(user.id), email=user.email, system_role=user.system_role, needs_setup=user.needs_setup)
 
 
-# Per-IP cache: ip → (timestamp, result_dict).
+_SETUP_STATUS_COOLDOWN: dict[str, float] = {}
-# Returns the cached result within the TTL instead of 429, because
+_SETUP_STATUS_COOLDOWN_SECONDS = 60
-# the answer (whether an admin exists) rarely changes and returning
-# 429 breaks multi-tab / post-restart reconnection storms.
-_SETUP_STATUS_CACHE: dict[str, tuple[float, dict]] = {}
-_SETUP_STATUS_CACHE_TTL_SECONDS = 60
 _MAX_TRACKED_SETUP_STATUS_IPS = 10000
-_SETUP_STATUS_INFLIGHT: dict[str, asyncio.Task[dict]] = {}
-_SETUP_STATUS_INFLIGHT_GUARD = asyncio.Lock()
 
 
 @router.get("/setup-status")
@@ -399,57 +392,30 @@ async def setup_status(request: Request):
     """Check if an admin account exists. Returns needs_setup=True when no admin exists."""
     client_ip = _get_client_ip(request)
     now = time.time()
-
+    last_check = _SETUP_STATUS_COOLDOWN.get(client_ip, 0)
-    # Return cached result when within TTL — avoids 429 on multi-tab reconnection.
+    elapsed = now - last_check
-    cached = _SETUP_STATUS_CACHE.get(client_ip)
+    if elapsed < _SETUP_STATUS_COOLDOWN_SECONDS:
-    if cached is not None:
+        retry_after = max(1, int(_SETUP_STATUS_COOLDOWN_SECONDS - elapsed))
-        cached_time, cached_result = cached
+        raise HTTPException(
-        if now - cached_time < _SETUP_STATUS_CACHE_TTL_SECONDS:
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS,
-            return cached_result
+            detail="Setup status check is rate limited",
-
+            headers={"Retry-After": str(retry_after)},
-    async with _SETUP_STATUS_INFLIGHT_GUARD:
+        )
-        # Recheck cache after waiting for the inflight guard.
-        now = time.time()
-        cached = _SETUP_STATUS_CACHE.get(client_ip)
-        if cached is not None:
-            cached_time, cached_result = cached
-            if now - cached_time < _SETUP_STATUS_CACHE_TTL_SECONDS:
-                return cached_result
-
-        task = _SETUP_STATUS_INFLIGHT.get(client_ip)
-        if task is None:
     # Evict stale entries when dict grows too large to bound memory usage.
-            if len(_SETUP_STATUS_CACHE) >= _MAX_TRACKED_SETUP_STATUS_IPS:
+    if len(_SETUP_STATUS_COOLDOWN) >= _MAX_TRACKED_SETUP_STATUS_IPS:
-                cutoff = now - _SETUP_STATUS_CACHE_TTL_SECONDS
+        cutoff = now - _SETUP_STATUS_COOLDOWN_SECONDS
-                stale = [k for k, (t, _) in _SETUP_STATUS_CACHE.items() if t < cutoff]
+        stale = [k for k, t in _SETUP_STATUS_COOLDOWN.items() if t < cutoff]
         for k in stale:
-                    del _SETUP_STATUS_CACHE[k]
+            del _SETUP_STATUS_COOLDOWN[k]
-                if len(_SETUP_STATUS_CACHE) >= _MAX_TRACKED_SETUP_STATUS_IPS:
+        # If still too large after evicting expired entries, remove oldest half.
-                    by_time = sorted(_SETUP_STATUS_CACHE.items(), key=lambda entry: entry[1][0])
+        if len(_SETUP_STATUS_COOLDOWN) >= _MAX_TRACKED_SETUP_STATUS_IPS:
+            by_time = sorted(_SETUP_STATUS_COOLDOWN.items(), key=lambda kv: kv[1])
             for k, _ in by_time[: len(by_time) // 2]:
-                        del _SETUP_STATUS_CACHE[k]
+                del _SETUP_STATUS_COOLDOWN[k]
-
+    _SETUP_STATUS_COOLDOWN[client_ip] = now
-            async def _compute_setup_status() -> dict:
     admin_count = await get_local_provider().count_admin_users()
     return {"needs_setup": admin_count == 0}
 
-            task = asyncio.create_task(_compute_setup_status())
-            _SETUP_STATUS_INFLIGHT[client_ip] = task
-
-    try:
-        result = await task
-    finally:
-        async with _SETUP_STATUS_INFLIGHT_GUARD:
-            if _SETUP_STATUS_INFLIGHT.get(client_ip) is task:
-                del _SETUP_STATUS_INFLIGHT[client_ip]
-
-    # Cache only the stable "initialized" result to avoid stale setup redirects.
-    if result["needs_setup"] is False:
-        _SETUP_STATUS_CACHE[client_ip] = (time.time(), result)
-    else:
-        _SETUP_STATUS_CACHE.pop(client_ip, None)
-    return result
-
 
 class InitializeAdminRequest(BaseModel):
     """Request model for first-boot admin account creation."""

backend/app/gateway/routers/mcp.py

@@ -63,99 +63,6 @@ class McpConfigUpdateRequest(BaseModel):
     )
 
 
-_MASKED_VALUE = "***"
-
-
-def _mask_server_config(server: McpServerConfigResponse) -> McpServerConfigResponse:
-    """Return a copy of server config with sensitive fields masked.
-
-    Masks env values, header values, and removes OAuth secrets so they
-    are not exposed through the GET API endpoint.
-    """
-    masked_env = {k: _MASKED_VALUE for k in server.env}
-    masked_headers = {k: _MASKED_VALUE for k in server.headers}
-    masked_oauth = None
-    if server.oauth is not None:
-        masked_oauth = server.oauth.model_copy(
-            update={
-                "client_secret": None,
-                "refresh_token": None,
-            }
-        )
-    return server.model_copy(
-        update={
-            "env": masked_env,
-            "headers": masked_headers,
-            "oauth": masked_oauth,
-        }
-    )
-
-
-def _merge_preserving_secrets(
-    incoming: McpServerConfigResponse,
-    existing: McpServerConfigResponse,
-) -> McpServerConfigResponse:
-    """Merge incoming config with existing, preserving secrets masked by GET.
-
-    When the frontend toggles ``enabled`` it round-trips the full config:
-    GET (masked) → modify enabled → PUT (masked values sent back).
-    This function ensures masked values (``***``) are replaced with the
-    real secrets from the current on-disk config.
-
-    ``***`` is only accepted for keys that already exist in *existing*.
-    New keys must provide a real value.
-
-    For OAuth secrets, ``None`` means "preserve the existing stored value"
-    so masked GET responses can be safely round-tripped. To explicitly clear
-    a stored secret, clients may send an empty string, which is converted
-    to ``None`` before persisting.
-    """
-    merged_env = {}
-    for k, v in incoming.env.items():
-        if v == _MASKED_VALUE:
-            if k in existing.env:
-                merged_env[k] = existing.env[k]
-            else:
-                raise HTTPException(
-                    status_code=400,
-                    detail=f"Cannot set env key '{k}' to masked value '***'; provide a real value.",
-                )
-        else:
-            merged_env[k] = v
-
-    merged_headers = {}
-    for k, v in incoming.headers.items():
-        if v == _MASKED_VALUE:
-            if k in existing.headers:
-                merged_headers[k] = existing.headers[k]
-            else:
-                raise HTTPException(
-                    status_code=400,
-                    detail=f"Cannot set header '{k}' to masked value '***'; provide a real value.",
-                )
-        else:
-            merged_headers[k] = v
-
-    merged_oauth = incoming.oauth
-    if incoming.oauth is not None and existing.oauth is not None:
-        # None = preserve (masked round-trip), "" = explicitly clear, else = new value
-        merged_client_secret = existing.oauth.client_secret if incoming.oauth.client_secret is None else (None if incoming.oauth.client_secret == "" else incoming.oauth.client_secret)
-        merged_refresh_token = existing.oauth.refresh_token if incoming.oauth.refresh_token is None else (None if incoming.oauth.refresh_token == "" else incoming.oauth.refresh_token)
-        merged_oauth = incoming.oauth.model_copy(
-            update={
-                "client_secret": merged_client_secret,
-                "refresh_token": merged_refresh_token,
-            }
-        )
-    return incoming.model_copy(
-        update={
-            "env": merged_env,
-            "headers": merged_headers,
-            "oauth": merged_oauth,
-        }
-    )
-
-
 @router.get(
     "/mcp/config",
     response_model=McpConfigResponse,
@@ -176,7 +83,7 @@ async def get_mcp_configuration() -> McpConfigResponse:
                     "enabled": true,
                     "command": "npx",
                     "args": ["-y", "@modelcontextprotocol/server-github"],
-                    "env": {"GITHUB_TOKEN": "***"},
+                    "env": {"GITHUB_TOKEN": "ghp_xxx"},
                     "description": "GitHub MCP server for repository operations"
                 }
             }
@@ -185,8 +92,7 @@ async def get_mcp_configuration() -> McpConfigResponse:
     """
     config = get_extensions_config()
 
-    servers = {name: _mask_server_config(McpServerConfigResponse(**server.model_dump())) for name, server in config.mcp_servers.items()}
+    return McpConfigResponse(mcp_servers={name: McpServerConfigResponse(**server.model_dump()) for name, server in config.mcp_servers.items()})
-    return McpConfigResponse(mcp_servers=servers)
 
 
 @router.put(
@@ -236,39 +142,14 @@ async def update_mcp_configuration(request: McpConfigUpdateRequest) -> McpConfig
             config_path = Path.cwd().parent / "extensions_config.json"
             logger.info(f"No existing extensions config found. Creating new config at: {config_path}")
 
-        # Load current config to preserve skills
+        # Load current config to preserve skills configuration
         current_config = get_extensions_config()
 
-        # Load raw (un-resolved) JSON from disk to use as the merge source.
+        # Convert request to dict format for JSON serialization
-        # This preserves $VAR placeholders in env values and top-level keys
+        config_data = {
-        # like mcpInterceptors that would otherwise be lost.
+            "mcpServers": {name: server.model_dump() for name, server in request.mcp_servers.items()},
-        raw_servers: dict[str, dict] = {}
+            "skills": {name: {"enabled": skill.enabled} for name, skill in current_config.skills.items()},
-        raw_other_keys: dict = {}
+        }
-        if config_path is not None and config_path.exists():
-            with open(config_path, encoding="utf-8") as f:
-                raw_data = json.load(f)
-            raw_servers = raw_data.get("mcpServers", {})
-            # Preserve any top-level keys beyond mcpServers/skills
-            for key, value in raw_data.items():
-                if key not in ("mcpServers", "skills"):
-                    raw_other_keys[key] = value
-
-        # Merge incoming server configs with raw on-disk secrets
-        merged_servers: dict[str, McpServerConfigResponse] = {}
-        for name, incoming in request.mcp_servers.items():
-            raw_server = raw_servers.get(name)
-            if raw_server is not None:
-                merged_servers[name] = _merge_preserving_secrets(
-                    incoming,
-                    McpServerConfigResponse(**raw_server),
-                )
-            else:
-                merged_servers[name] = incoming
-
-        # Build config data preserving all top-level keys from the original file
-        config_data = dict(raw_other_keys)
-        config_data["mcpServers"] = {name: server.model_dump() for name, server in merged_servers.items()}
-        config_data["skills"] = {name: {"enabled": skill.enabled} for name, skill in current_config.skills.items()}
 
         # Write the configuration to file
         with open(config_path, "w", encoding="utf-8") as f:
@@ -281,8 +162,7 @@ async def update_mcp_configuration(request: McpConfigUpdateRequest) -> McpConfig
 
         # Reload the configuration and update the global cache
         reloaded_config = reload_extensions_config()
-        servers = {name: _mask_server_config(McpServerConfigResponse(**server.model_dump())) for name, server in reloaded_config.mcp_servers.items()}
+        return McpConfigResponse(mcp_servers={name: McpServerConfigResponse(**server.model_dump()) for name, server in reloaded_config.mcp_servers.items()})
-        return McpConfigResponse(mcp_servers=servers)
 
     except Exception as e:
         logger.error(f"Failed to update MCP configuration: {e}", exc_info=True)

backend/app/gateway/routers/thread_runs.py

@@ -22,7 +22,7 @@ from pydantic import BaseModel, Field
 from app.gateway.authz import require_permission
 from app.gateway.deps import get_checkpointer, get_current_user, get_feedback_repo, get_run_event_store, get_run_manager, get_run_store, get_stream_bridge
 from app.gateway.services import sse_consumer, start_run
-from deerflow.runtime import RunRecord, RunStatus, serialize_channel_values
+from deerflow.runtime import RunRecord, serialize_channel_values
 
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api/threads", tags=["runs"])
@@ -94,12 +94,6 @@ class ThreadTokenUsageResponse(BaseModel):
 # ---------------------------------------------------------------------------
 
 
-def _cancel_conflict_detail(run_id: str, record: RunRecord) -> str:
-    if record.status in (RunStatus.pending, RunStatus.running):
-        return f"Run {run_id} is not active on this worker and cannot be cancelled"
-    return f"Run {run_id} is not cancellable (status: {record.status.value})"
-
-
 def _record_to_response(record: RunRecord) -> RunResponse:
     return RunResponse(
         run_id=record.run_id,
@@ -186,8 +180,7 @@ async def wait_run(thread_id: str, body: RunCreateRequest, request: Request) ->
 async def list_runs(thread_id: str, request: Request) -> list[RunResponse]:
     """List all runs for a thread."""
     run_mgr = get_run_manager(request)
-    user_id = await get_current_user(request)
+    records = await run_mgr.list_by_thread(thread_id)
-    records = await run_mgr.list_by_thread(thread_id, user_id=user_id)
     return [_record_to_response(r) for r in records]
 
 
@@ -196,8 +189,7 @@ async def list_runs(thread_id: str, request: Request) -> list[RunResponse]:
 async def get_run(thread_id: str, run_id: str, request: Request) -> RunResponse:
     """Get details of a specific run."""
     run_mgr = get_run_manager(request)
-    user_id = await get_current_user(request)
+    record = run_mgr.get(run_id)
-    record = await run_mgr.get(run_id, user_id=user_id)
     if record is None or record.thread_id != thread_id:
         raise HTTPException(status_code=404, detail=f"Run {run_id} not found")
     return _record_to_response(record)
@@ -220,13 +212,16 @@ async def cancel_run(
     - wait=false: Return immediately with 202
     """
     run_mgr = get_run_manager(request)
-    record = await run_mgr.get(run_id)
+    record = run_mgr.get(run_id)
     if record is None or record.thread_id != thread_id:
         raise HTTPException(status_code=404, detail=f"Run {run_id} not found")
 
     cancelled = await run_mgr.cancel(run_id, action=action)
     if not cancelled:
-        raise HTTPException(status_code=409, detail=_cancel_conflict_detail(run_id, record))
+        raise HTTPException(
+            status_code=409,
+            detail=f"Run {run_id} is not cancellable (status: {record.status.value})",
+        )
 
     if wait and record.task is not None:
         try:
@@ -242,14 +237,12 @@ async def cancel_run(
 @require_permission("runs", "read", owner_check=True)
 async def join_run(thread_id: str, run_id: str, request: Request) -> StreamingResponse:
     """Join an existing run's SSE stream."""
+    bridge = get_stream_bridge(request)
     run_mgr = get_run_manager(request)
-    record = await run_mgr.get(run_id)
+    record = run_mgr.get(run_id)
     if record is None or record.thread_id != thread_id:
         raise HTTPException(status_code=404, detail=f"Run {run_id} not found")
-    if record.store_only:
-        raise HTTPException(status_code=409, detail=f"Run {run_id} is not active on this worker and cannot be streamed")
 
-    bridge = get_stream_bridge(request)
     return StreamingResponse(
         sse_consumer(bridge, record, request, run_mgr),
         media_type="text/event-stream",
@@ -278,18 +271,14 @@ async def stream_existing_run(
     remaining buffered events so the client observes a clean shutdown.
     """
     run_mgr = get_run_manager(request)
-    record = await run_mgr.get(run_id)
+    record = run_mgr.get(run_id)
     if record is None or record.thread_id != thread_id:
         raise HTTPException(status_code=404, detail=f"Run {run_id} not found")
-    if record.store_only and action is None:
-        raise HTTPException(status_code=409, detail=f"Run {run_id} is not active on this worker and cannot be streamed")
 
     # Cancel if an action was requested (stop-button / interrupt flow)
     if action is not None:
         cancelled = await run_mgr.cancel(run_id, action=action)
-        if not cancelled:
+        if cancelled and wait and record.task is not None:
-            raise HTTPException(status_code=409, detail=_cancel_conflict_detail(run_id, record))
-        if wait and record.task is not None:
             try:
                 await record.task
             except (asyncio.CancelledError, Exception):

backend/app/gateway/routers/threads.py

@@ -90,28 +90,6 @@ class ThreadSearchRequest(BaseModel):
     offset: int = Field(default=0, ge=0, description="Pagination offset")
     status: str | None = Field(default=None, description="Filter by thread status")
 
-    @field_validator("metadata")
-    @classmethod
-    def _validate_metadata_filters(cls, v: dict[str, Any]) -> dict[str, Any]:
-        """Reject filter entries the SQL backend cannot compile.
-
-        Enforces consistent behaviour across SQL and memory backends.
-        See ``deerflow.persistence.json_compat`` for the shared validators.
-        """
-        if not v:
-            return v
-        from deerflow.persistence.json_compat import validate_metadata_filter_key, validate_metadata_filter_value
-
-        bad_entries: list[str] = []
-        for key, value in v.items():
-            if not validate_metadata_filter_key(key):
-                bad_entries.append(f"{key!r} (unsafe key)")
-            elif not validate_metadata_filter_value(value):
-                bad_entries.append(f"{key!r} (unsupported value type {type(value).__name__})")
-        if bad_entries:
-            raise ValueError(f"Invalid metadata filter entries: {', '.join(bad_entries)}")
-        return v
-
 
 class ThreadStateResponse(BaseModel):
     """Response model for thread state."""
@@ -316,18 +294,14 @@ async def search_threads(body: ThreadSearchRequest, request: Request) -> list[Th
     (SQL-backed for sqlite/postgres, Store-backed for memory mode).
     """
     from app.gateway.deps import get_thread_store
-    from deerflow.persistence.thread_meta import InvalidMetadataFilterError
 
     repo = get_thread_store(request)
-    try:
     rows = await repo.search(
         metadata=body.metadata or None,
         status=body.status,
         limit=body.limit,
         offset=body.offset,
     )
-    except InvalidMetadataFilterError as exc:
-        raise HTTPException(status_code=400, detail=str(exc)) from exc
     return [
         ThreadResponse(
             thread_id=r["thread_id"],

backend/app/gateway/services.py

@@ -15,12 +15,10 @@ from collections.abc import Mapping
 from typing import Any
 
 from fastapi import HTTPException, Request
-from langchain_core.messages import BaseMessage
+from langchain_core.messages import HumanMessage
-from langchain_core.messages.utils import convert_to_messages
 
 from app.gateway.deps import get_run_context, get_run_manager, get_stream_bridge
 from app.gateway.utils import sanitize_log_param
-from deerflow.config.app_config import get_app_config
 from deerflow.runtime import (
     END_SENTINEL,
     HEARTBEAT_SENTINEL,
@@ -33,7 +31,6 @@ from deerflow.runtime import (
     UnsupportedStrategyError,
     run_agent,
 )
-from deerflow.runtime.runs.naming import resolve_root_run_name
 
 logger = logging.getLogger(__name__)
 
@@ -77,35 +74,21 @@ def normalize_stream_modes(raw: list[str] | str | None) -> list[str]:
 
 
 def normalize_input(raw_input: dict[str, Any] | None) -> dict[str, Any]:
-    """Convert LangGraph Platform input format to LangChain state dict.
+    """Convert LangGraph Platform input format to LangChain state dict."""
-
-    Delegates dict→message coercion to ``langchain_core.messages.utils.convert_to_messages``
-    so that ``additional_kwargs`` (e.g. uploaded-file metadata — gh #3132), ``id``,
-    ``name``, and non-human roles (ai/system/tool) survive unchanged.  An earlier
-    hand-rolled version only forwarded ``content`` and collapsed every role to
-    ``HumanMessage``, which silently stripped frontend-supplied attachments.
-
-    Malformed message dicts (missing ``role``/``type``/``content``, unsupported
-    role, etc.) raise ``HTTPException(400)`` with the offending index, instead
-    of bubbling up as a 500.  The gateway is a system boundary, so per-entry
-    validation errors are the right shape for clients to retry against.
-    """
     if raw_input is None:
         return {}
     messages = raw_input.get("messages")
     if messages and isinstance(messages, list):
-        converted: list[Any] = []
+        converted = []
-        for index, msg in enumerate(messages):
+        for msg in messages:
-            if isinstance(msg, BaseMessage):
+            if isinstance(msg, dict):
-                converted.append(msg)
+                role = msg.get("role", msg.get("type", "user"))
-            elif isinstance(msg, dict):
+                content = msg.get("content", "")
-                try:
+                if role in ("user", "human"):
-                    converted.extend(convert_to_messages([msg]))
+                    converted.append(HumanMessage(content=content))
-                except (ValueError, TypeError, NotImplementedError) as exc:
+                else:
-                    raise HTTPException(
+                    # TODO: handle other message types (system, ai, tool)
-                        status_code=400,
+                    converted.append(HumanMessage(content=content))
-                        detail=f"Invalid message at input.messages[{index}]: {exc}",
-                    ) from exc
             else:
                 converted.append(msg)
         return {**raw_input, "messages": converted}
@@ -251,7 +234,6 @@ def build_run_config(
             target = config.setdefault("configurable", {})
         if target is not None and "agent_name" not in target:
             target["agent_name"] = normalized
-        config.setdefault("run_name", resolve_root_run_name(config, normalized))
     if metadata:
         config.setdefault("metadata", {}).update(metadata)
     return config
@@ -285,23 +267,6 @@ async def start_run(
 
     disconnect = DisconnectMode.cancel if body.on_disconnect == "cancel" else DisconnectMode.continue_
 
-    body_context = getattr(body, "context", None) or {}
-    model_name = body_context.get("model_name")
-
-    # Coerce non-string model_name values to str before truncation.
-    if model_name is not None and not isinstance(model_name, str):
-        model_name = str(model_name)
-
-    # Validate model against the allowlist when a model_name is provided.
-    if model_name:
-        app_config = get_app_config()
-        resolved = app_config.get_model_config(model_name)
-        if resolved is None:
-            raise HTTPException(
-                status_code=400,
-                detail=f"Model {model_name!r} is not in the configured model allowlist",
-            )
-
     try:
         record = await run_mgr.create_or_reject(
             thread_id,
@@ -310,7 +275,6 @@ async def start_run(
             metadata=body.metadata or {},
             kwargs={"input": body.input, "config": body.config},
             multitask_strategy=body.multitask_strategy,
-            model_name=model_name,
         )
     except ConflictError as exc:
         raise HTTPException(status_code=409, detail=str(exc)) from exc

backend/docs/API.md

@@ -6,16 +6,16 @@ This document provides a complete reference for the DeerFlow backend APIs.
 
 DeerFlow backend exposes two sets of APIs:
 
-1. **LangGraph-compatible API** - Agent interactions, threads, and streaming (`/api/langgraph/*`)
+1. **LangGraph API** - Agent interactions, threads, and streaming (`/api/langgraph/*`)
 2. **Gateway API** - Models, MCP, skills, uploads, and artifacts (`/api/*`)
 
 All APIs are accessed through the Nginx reverse proxy at port 2026.
 
-## LangGraph-compatible API
+## LangGraph API
 
 Base URL: `/api/langgraph`
 
-The public LangGraph-compatible API follows LangGraph SDK conventions. In the unified nginx deployment, Gateway owns `/api/langgraph/*` and translates those paths to its native `/api/*` run, thread, and streaming routers.
+The LangGraph API is provided by the LangGraph server and follows the LangGraph SDK conventions.
 
 ### Threads
 
@@ -104,11 +104,17 @@ Content-Type: application/json
 **Recursion Limit:**
 
 `config.recursion_limit` caps the number of graph steps LangGraph will execute
-in a single run. The unified Gateway path defaults to `100` in
+in a single run. The `/api/langgraph/*` endpoints go straight to the LangGraph
-`build_run_config` (see `backend/app/gateway/services.py`), which is a safer
+server and therefore inherit LangGraph's native default of **25**, which is
-starting point for plan-mode or subagent-heavy runs. Clients can still set
+too low for plan-mode or subagent-heavy runs — the agent typically errors out
-`recursion_limit` explicitly in the request body; increase it if you run deeply
+with `GraphRecursionError` after the first round of subagent results comes
-nested subagent graphs.
+back, before the lead agent can synthesize the final answer.
+
+DeerFlow's own Gateway and IM-channel paths mitigate this by defaulting to
+`100` in `build_run_config` (see `backend/app/gateway/services.py`), but
+clients calling the LangGraph API directly must set `recursion_limit`
+explicitly in the request body. `100` matches the Gateway default and is a
+safe starting point; increase it if you run deeply nested subagent graphs.
 
 **Configurable Options:**
 - `model_name` (string): Override the default model
@@ -535,28 +541,14 @@ All APIs return errors in a consistent format:
 
 ## Authentication
 
-DeerFlow enforces authentication for all non-public HTTP routes. Public routes are limited to health/docs metadata and these public auth endpoints:
+Currently, DeerFlow does not implement authentication. All APIs are accessible without credentials.
 
-- `POST /api/v1/auth/initialize` creates the first admin account when no admin exists.
+Note: This is about DeerFlow API authentication. MCP outbound connections can still use OAuth for configured HTTP/SSE MCP servers.
-- `POST /api/v1/auth/login/local` logs in with email/password and sets an HttpOnly `access_token` cookie.
-- `POST /api/v1/auth/register` creates a regular `user` account and sets the session cookie.
-- `POST /api/v1/auth/logout` clears the session cookie.
-- `GET /api/v1/auth/setup-status` reports whether the first admin still needs to be created.
 
-The authenticated auth endpoints are:
+For production deployments, it is recommended to:
-
+1. Use Nginx for basic auth or OAuth integration
-- `GET /api/v1/auth/me` returns the current user.
+2. Deploy behind a VPN or private network
-- `POST /api/v1/auth/change-password` changes password, optionally changes email during setup, increments `token_version`, and reissues the cookie.
+3. Implement custom authentication middleware
-
-Protected state-changing requests also require the CSRF double-submit token: send the `csrf_token` cookie value as the `X-CSRF-Token` header. Login/register/initialize/logout are bootstrap auth endpoints: they are exempt from the double-submit token but still reject hostile browser `Origin` headers.
-
-User isolation is enforced from the authenticated user context:
-
-- Thread metadata is scoped by `threads_meta.user_id`; search/read/write/delete APIs only expose the current user's threads.
-- Thread files live under `{base_dir}/users/{user_id}/threads/{thread_id}/user-data/` and are exposed inside the sandbox as `/mnt/user-data/`.
-- Memory and custom agents are stored under `{base_dir}/users/{user_id}/...`.
-
-Note: MCP outbound connections can still use OAuth for configured HTTP/SSE MCP servers; that is separate from DeerFlow API authentication.
 
 ---
 
@@ -575,13 +567,12 @@ location /api/ {
 
 ---
 
-## Streaming Support
+## WebSocket Support
 
-Gateway's LangGraph-compatible API streams run events with Server-Sent Events (SSE):
+The LangGraph server supports WebSocket connections for real-time streaming. Connect to:
 
-```http
+```
-POST /api/langgraph/threads/{thread_id}/runs/stream
+ws://localhost:2026/api/langgraph/threads/{thread_id}/runs/stream
-Accept: text/event-stream
 ```
 
 ---
@@ -617,21 +608,13 @@ const response = await fetch('/api/models');
 const data = await response.json();
 console.log(data.models);
 
-// Create a run and stream SSE events
+// Using EventSource for streaming
-const streamResponse = await fetch(`/api/langgraph/threads/${threadId}/runs/stream`, {
+const eventSource = new EventSource(
-  method: "POST",
+  `/api/langgraph/threads/${threadId}/runs/stream`
-  headers: {
+);
-    "Content-Type": "application/json",
+eventSource.onmessage = (event) => {
-    Accept: "text/event-stream",
+  console.log(JSON.parse(event.data));
-  },
+};
-  body: JSON.stringify({
-    input: { messages: [{ role: "user", content: "Hello" }] },
-    stream_mode: ["values", "messages-tuple", "custom"],
-  }),
-});
-
-const reader = streamResponse.body?.getReader();
-// Decode and parse SSE frames from reader in your client code.
 ```
 
 ### cURL Examples
@@ -666,7 +649,7 @@ curl -X POST http://localhost:2026/api/langgraph/threads/abc123/runs \
   }'
 ```
 
-> The unified Gateway path defaults `config.recursion_limit` to 100 for
+> The `/api/langgraph/*` endpoints bypass DeerFlow's Gateway and inherit
-> plan-mode and subagent-heavy runs. Clients may still set
+> LangGraph's native `recursion_limit` default of 25, which is too low for
-> `config.recursion_limit` explicitly — see the [Create Run](#create-run)
+> plan-mode or subagent runs. Set `config.recursion_limit` explicitly — see
-> section for details.
+> the [Create Run](#create-run) section for details.

backend/docs/ARCHITECTURE.md

@@ -14,28 +14,30 @@ This document provides a comprehensive overview of the DeerFlow backend architec
 │                          Nginx (Port 2026)                               │
 │                    Unified Reverse Proxy Entry Point                      │
 │  ┌────────────────────────────────────────────────────────────────────┐  │
-│  │  /api/langgraph/*  →  Gateway LangGraph-compatible runtime (8001)  │  │
+│  │  /api/langgraph/*  →  LangGraph Server (2024)                      │  │
-│  │  /api/*            →  Gateway REST APIs (8001)                     │  │
+│  │  /api/*            →  Gateway API (8001)                           │  │
 │  │  /*                →  Frontend (3000)                               │  │
 │  └────────────────────────────────────────────────────────────────────┘  │
 └─────────────────────────────────┬────────────────────────────────────────┘
                                   │
-          ┌───────────────────────┴───────────────────────┐
+          ┌───────────────────────┼───────────────────────┐
+          │                       │                       │
+          ▼                       ▼                       ▼
+┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐
+│   LangGraph Server  │ │    Gateway API      │ │     Frontend        │
+│     (Port 2024)     │ │    (Port 8001)      │ │    (Port 3000)      │
+│                     │ │                     │ │                     │
+│  - Agent Runtime    │ │  - Models API       │ │  - Next.js App      │
+│  - Thread Mgmt      │ │  - MCP Config       │ │  - React UI         │
+│  - SSE Streaming    │ │  - Skills Mgmt      │ │  - Chat Interface   │
+│  - Checkpointing    │ │  - File Uploads     │ │                     │
+│                     │ │  - Thread Cleanup   │ │                     │
+│                     │ │  - Artifacts        │ │                     │
+└─────────────────────┘ └─────────────────────┘ └─────────────────────┘
+          │                       │
+          │     ┌─────────────────┘
           │     │
           ▼     ▼
-┌─────────────────────────────────────────────┐ ┌─────────────────────┐
-│              Gateway API                    │ │     Frontend        │
-│              (Port 8001)                    │ │    (Port 3000)      │
-│                                             │ │                     │
-│  - LangGraph-compatible runs/threads API    │ │  - Next.js App      │
-│  - Embedded Agent Runtime                   │ │  - React UI         │
-│  - SSE Streaming                            │ │  - Chat Interface   │
-│  - Checkpointing                            │ │                     │
-│  - Models, MCP, Skills, Uploads, Artifacts  │ │                     │
-│  - Thread Cleanup                           │ │                     │
-└─────────────────────────────────────────────┘ └─────────────────────┘
-          │
-          ▼
 ┌──────────────────────────────────────────────────────────────────────────┐
 │                         Shared Configuration                              │
 │  ┌─────────────────────────┐  ┌────────────────────────────────────────┐ │
@@ -50,9 +52,9 @@ This document provides a comprehensive overview of the DeerFlow backend architec
 
 ## Component Details
 
-### Gateway Embedded Agent Runtime
+### LangGraph Server
 
-The agent runtime is embedded in the FastAPI Gateway and built on LangGraph for robust multi-agent workflow orchestration. Nginx rewrites `/api/langgraph/*` to Gateway's native `/api/*` routes, so the public API remains compatible with LangGraph SDK clients without running a separate LangGraph server.
+The LangGraph server is the core agent runtime, built on LangGraph for robust multi-agent workflow orchestration.
 
 **Entry Point**: `packages/harness/deerflow/agents/lead_agent/agent.py:make_lead_agent`
 
@@ -63,8 +65,7 @@ The agent runtime is embedded in the FastAPI Gateway and built on LangGraph for
 - Tool execution orchestration
 - SSE streaming for real-time responses
 
-**Graph registry**: `langgraph.json` remains available for tooling, Studio, or direct LangGraph Server compatibility.
+**Configuration**: `langgraph.json`
-It is not the default service entrypoint; scripts and Docker deployments run the Gateway embedded runtime.
 
 ```json
 {
@@ -77,13 +78,12 @@ It is not the default service entrypoint; scripts and Docker deployments run the
 
 ### Gateway API
 
-FastAPI application providing REST endpoints plus the public LangGraph-compatible `/api/langgraph/*` runtime routes.
+FastAPI application providing REST endpoints for non-agent operations.
 
 **Entry Point**: `app/gateway/app.py`
 
 **Routers**:
 - `models.py` - `/api/models` - Model listing and details
-- `thread_runs.py` / `runs.py` - `/api/threads/{id}/runs`, `/api/runs/*` - LangGraph-compatible runs and streaming
 - `mcp.py` - `/api/mcp` - MCP server configuration
 - `skills.py` - `/api/skills` - Skills management
 - `uploads.py` - `/api/threads/{id}/uploads` - File upload
@@ -91,7 +91,7 @@ FastAPI application providing REST endpoints plus the public LangGraph-compatibl
 - `artifacts.py` - `/api/threads/{id}/artifacts` - Artifact serving
 - `suggestions.py` - `/api/threads/{id}/suggestions` - Follow-up suggestion generation
 
-The web conversation delete flow first deletes Gateway-managed thread state through the LangGraph-compatible route, then the Gateway `threads.py` router removes DeerFlow-managed filesystem data via `Paths.delete_thread_dir()`.
+The web conversation delete flow is now split across both backend surfaces: LangGraph handles `DELETE /api/langgraph/threads/{thread_id}` for thread state, then the Gateway `threads.py` router removes DeerFlow-managed filesystem data via `Paths.delete_thread_dir()`.
 
 ### Agent Architecture
 
@@ -353,10 +353,10 @@ SKILL.md Format:
    POST /api/langgraph/threads/{thread_id}/runs
    {"input": {"messages": [{"role": "user", "content": "Hello"}]}}
 
-2. Nginx → Gateway API (8001)
+2. Nginx → LangGraph Server (2024)
-   `/api/langgraph/*` is rewritten to Gateway's LangGraph-compatible `/api/*` routes
+   Proxied to LangGraph server
 
-3. Gateway embedded runtime
+3. LangGraph Server
    a. Load/create thread state
    b. Execute middleware chain:
       - ThreadDataMiddleware: Set up paths
@@ -412,7 +412,7 @@ SKILL.md Format:
 ### Thread Cleanup Flow
 
 ```
-1. Client deletes conversation via the LangGraph-compatible Gateway route
+1. Client deletes conversation via LangGraph
    DELETE /api/langgraph/threads/{thread_id}
 
 2. Web UI follows up with Gateway cleanup

backend/docs/AUTH_DESIGN.md

@@ -1,331 +0,0 @@
-# 用户认证与隔离设计
-
-本文档描述 DeerFlow 当前内置认证模块的设计，而不是历史 RFC。它覆盖浏览器登录、API 认证、CSRF、用户隔离、首次初始化、密码重置、内部调用和升级迁移。
-
-## 设计目标
-
-认证模块的核心目标是把 DeerFlow 从“本地单用户工具”提升为“可多用户部署的 agent runtime”，并让用户身份贯穿 HTTP API、LangGraph-compatible runtime、文件系统、memory、自定义 agent 和反馈数据。
-
-设计约束：
-
-- 默认强制认证：除健康检查、文档和 auth bootstrap 端点外，HTTP 路由都必须有有效 session。
-- 服务端持有所有权：客户端 metadata 不能声明 `user_id` 或 `owner_id`。
-- 隔离默认开启：repository（仓储）、文件路径、memory、agent 配置默认按当前用户解析。
-- 旧数据可升级：无认证版本留下的 thread 可以在 admin 存在后迁移到 admin。
-- 密码不进日志：首次初始化由操作者设置密码；`reset_admin` 只写 0600 凭据文件。
-
-非目标：
-
-- 当前 OAuth 端点只是占位，尚未实现第三方登录。
-- 当前用户角色只有 `admin` 和 `user`，尚未实现细粒度 RBAC。
-- 当前登录限速是进程内字典，多 worker 下不是全局精确限速。
-
-## 核心模型
-
-```mermaid
-graph TB
-  classDef actor fill:#D8CFC4,stroke:#6E6259,color:#2F2A26;
-  classDef api fill:#C9D7D2,stroke:#5D706A,color:#21302C;
-  classDef state fill:#D7D3E8,stroke:#6B6680,color:#29263A;
-  classDef data fill:#E5D2C4,stroke:#806A5B,color:#30251E;
-
-  Browser["Browser — access_token cookie and csrf_token cookie"]:::actor
-  AuthMiddleware["AuthMiddleware — strict session gate"]:::api
-  CSRFMiddleware["CSRFMiddleware — double-submit token and Origin check"]:::api
-  AuthRoutes["Auth routes — initialize login register logout me change-password"]:::api
-  UserContext["Current user ContextVar — request-scoped identity"]:::state
-  Repositories["Repositories — AUTO resolves user_id from context"]:::state
-  Files["Filesystem — users/{user_id}/threads/{thread_id}/user-data"]:::data
-  Memory["Memory and agents — users/{user_id}/memory.json and agents"]:::data
-
-  Browser --> AuthMiddleware
-  Browser --> CSRFMiddleware
-  AuthMiddleware --> AuthRoutes
-  AuthMiddleware --> UserContext
-  UserContext --> Repositories
-  UserContext --> Files
-  UserContext --> Memory
-```
-
-### 用户表
-
-用户记录定义在 `app.gateway.auth.models.User`，持久化到 `users` 表。关键字段：
-
-| 字段 | 语义 |
-|---|---|
-| `id` | 用户主键，JWT `sub` 使用该值 |
-| `email` | 唯一登录名 |
-| `password_hash` | bcrypt hash，OAuth 用户可为空 |
-| `system_role` | `admin` 或 `user` |
-| `needs_setup` | reset 后要求用户完成邮箱 / 密码设置 |
-| `token_version` | 改密码或 reset 时递增，用于废弃旧 JWT |
-
-### 运行时身份
-
-认证成功后，`AuthMiddleware` 把用户同时写入：
-
-- `request.state.user`
-- `request.state.auth`
-- `deerflow.runtime.user_context` 的 `ContextVar`
-
-`ContextVar` 是这里的核心边界。上层 Gateway 负责写入身份，下层 persistence / file path 只读取结构化的当前用户，不反向依赖 `app.gateway.auth` 具体类型。
-
-可以把 repository 调用的用户参数理解成一个三态 ADT：
-
-```scala
-enum UserScope:
-  case AutoFromContext
-  case Explicit(userId: String)
-  case BypassForMigration
-```
-
-对应 Python 实现是 `AUTO | str | None`：
-
-- `AUTO`：从 `ContextVar` 解析当前用户；没有上下文则抛错。
-- `str`：显式指定用户，主要用于测试或管理脚本。
-- `None`：跳过用户过滤，只允许迁移脚本或 admin CLI 使用。
-
-## 登录与初始化流程
-
-### 首次初始化
-
-首次启动时，如果没有 admin，服务不会自动创建账号，只记录日志提示访问 `/setup`。
-
-流程：
-
-1. 用户访问 `/setup`。
-2. 前端调用 `GET /api/v1/auth/setup-status`。
-3. 如果返回 `{"needs_setup": true}`，前端展示创建 admin 表单。
-4. 表单提交 `POST /api/v1/auth/initialize`。
-5. 服务端确认当前没有 admin，创建 `system_role="admin"`、`needs_setup=false` 的用户。
-6. 服务端设置 `access_token` HttpOnly cookie，用户进入 workspace。
-
-`/api/v1/auth/initialize` 只在没有 admin 时可用。并发初始化由数据库唯一约束兜底，失败方返回 409。
-
-### 普通登录
-
-`POST /api/v1/auth/login/local` 使用 `OAuth2PasswordRequestForm`：
-
-- `username` 是邮箱。
-- `password` 是密码。
-- 成功后签发 JWT，放入 `access_token` HttpOnly cookie。
-- 响应体只返回 `expires_in` 和 `needs_setup`，不返回 token。
-
-登录失败会按客户端 IP 计数。IP 解析只在 TCP peer 属于 `AUTH_TRUSTED_PROXIES` 时信任 `X-Real-IP`，不使用 `X-Forwarded-For`。
-
-### 注册
-
-`POST /api/v1/auth/register` 创建普通 `user`，并自动登录。
-
-当前实现允许在没有 admin 时注册普通用户，但 `setup-status` 仍会返回 `needs_setup=true`，因为 admin 仍不存在。这是当前产品策略边界：如果后续要求“必须先初始化 admin 才能注册普通用户”，需要在 `/register` 增加 admin-exists gate。
-
-### 改密码与 reset setup
-
-`POST /api/v1/auth/change-password` 需要当前密码和新密码：
-
-- 校验当前密码。
-- 更新 bcrypt hash。
-- `token_version += 1`，使旧 JWT 立即失效。
-- 重新签发 cookie。
-- 如果 `needs_setup=true` 且传了 `new_email`，则更新邮箱并清除 `needs_setup`。
-
-`python -m app.gateway.auth.reset_admin` 会：
-
-- 找到 admin 或指定邮箱用户。
-- 生成随机密码。
-- 更新密码 hash。
-- `token_version += 1`。
-- 设置 `needs_setup=true`。
-- 写入 `.deer-flow/admin_initial_credentials.txt`，权限 `0600`。
-
-命令行只输出凭据文件路径，不输出明文密码。
-
-## HTTP 认证边界
-
-`AuthMiddleware` 是 fail-closed（默认拒绝）的全局认证门。
-
-公开路径：
-
-- `/health`
-- `/docs`
-- `/redoc`
-- `/openapi.json`
-- `/api/v1/auth/login/local`
-- `/api/v1/auth/register`
-- `/api/v1/auth/logout`
-- `/api/v1/auth/setup-status`
-- `/api/v1/auth/initialize`
-
-其余路径都要求有效 `access_token` cookie。存在 cookie 但 JWT 无效、过期、用户不存在或 `token_version` 不匹配时，直接返回 401，而不是让请求穿透到业务路由。
-
-路由级别的 owner check 由 `require_permission(..., owner_check=True)` 完成：
-
-- 读类请求允许旧的未追踪 legacy thread 兼容读取。
-- 写 / 删除类请求使用 `require_existing=True`，要求 thread row 存在且属于当前用户，避免删除后缺 row 导致其他用户误通过。
-
-## CSRF 设计
-
-DeerFlow 使用 Double Submit Cookie：
-
-- 服务端设置 `csrf_token` cookie。
-- 前端 state-changing 请求发送同值 `X-CSRF-Token` header。
-- 服务端用 `secrets.compare_digest` 比较 cookie/header。
-
-需要 CSRF 的方法：
-
-- `POST`
-- `PUT`
-- `DELETE`
-- `PATCH`
-
-auth bootstrap 端点（login/register/initialize/logout）不要求 double-submit token，因为首次调用时浏览器还没有 token；但这些端点会校验 browser `Origin`，拒绝 hostile Origin，避免 login CSRF / session fixation。
-
-## 用户隔离
-
-### Thread metadata
-
-Thread metadata 存在 `threads_meta`，关键隔离字段是 `user_id`。
-
-创建 thread 时：
-
-- 客户端传入的 `metadata.user_id` 和 `metadata.owner_id` 会被剥离。
-- `ThreadMetaRepository.create(..., user_id=AUTO)` 从 `ContextVar` 解析真实用户。
-- `/api/threads/search` 默认只返回当前用户的 thread。
-
-读取 / 修改 / 删除时：
-
-- `get()` 默认按当前用户过滤。
-- `check_access()` 用于路由 owner check。
-- 对其他用户的 thread 返回 404，避免泄露资源存在性。
-
-### 文件系统
-
-当前线程文件布局：
-
-```text
-{base_dir}/users/{user_id}/threads/{thread_id}/user-data/
-├── workspace/
-├── uploads/
-└── outputs/
-```
-
-agent 在 sandbox 内看到统一虚拟路径：
-
-```text
-/mnt/user-data/workspace
-/mnt/user-data/uploads
-/mnt/user-data/outputs
-```
-
-`ThreadDataMiddleware` 使用 `get_effective_user_id()` 解析当前用户并生成线程路径。没有认证上下文时会落到 `default` 用户桶，主要用于内部调用、嵌入式 client 或无 HTTP 的本地执行路径。
-
-### Memory
-
-默认 memory 存储：
-
-```text
-{base_dir}/users/{user_id}/memory.json
-{base_dir}/users/{user_id}/agents/{agent_name}/memory.json
-```
-
-有用户上下文时，空或相对 `memory.storage_path` 都使用上述 per-user 默认路径；只有绝对 `memory.storage_path` 会视为显式 opt-out（退出） per-user isolation，所有用户共享该路径。无用户上下文的 legacy 路径仍会把相对 `storage_path` 解析到 `Paths.base_dir` 下。
-
-### 自定义 agent
-
-用户自定义 agent 写入：
-
-```text
-{base_dir}/users/{user_id}/agents/{agent_name}/
-├── config.yaml
-├── SOUL.md
-└── memory.json
-```
-
-旧布局 `{base_dir}/agents/{agent_name}/` 只作为只读兼容回退。更新或删除旧共享 agent 会要求先运行迁移脚本。
-
-## 内部调用与 IM 渠道
-
-IM channel worker 不是浏览器用户，不持有浏览器 cookie。它们通过 Gateway 内部认证：
-
-- 请求带 `X-DeerFlow-Internal-Token`。
-- 同时带匹配的 CSRF cookie/header。
-- 服务端识别为内部用户，`id="default"`、`system_role="internal"`。
-
-这意味着 channel 产生的数据默认进入 `default` 用户桶。这个选择适合“平台级 bot 身份”，但不是“每个 IM 用户单独隔离”。如果后续要做到外部 IM 用户隔离，需要把外部 platform user 映射到 DeerFlow user，并让 channel manager 设置对应的 scoped identity。
-
-## LangGraph-compatible 认证
-
-Gateway 内嵌 runtime 路径由 `AuthMiddleware` 和 `CSRFMiddleware` 保护。
-
-仓库仍保留 `app.gateway.langgraph_auth`，用于 LangGraph Server 直连模式：
-
-- `@auth.authenticate` 校验 JWT cookie、CSRF、用户存在性和 `token_version`。
-- `@auth.on` 在写入 metadata 时注入 `user_id`，并在读路径返回 `{"user_id": current_user}` 过滤条件。
-
-这保证 Gateway 路由和 LangGraph-compatible 直连模式使用同一 JWT 语义。
-
-## 升级与迁移
-
-从无认证版本升级时，可能存在没有 `user_id` 的历史 thread。
-
-当前策略：
-
-1. 首次启动如果没有 admin，只提示访问 `/setup`，不迁移。
-2. 操作者创建 admin。
-3. 后续启动时，`_ensure_admin_user()` 找到 admin，并把 LangGraph store 中缺少 `metadata.user_id` 的 thread 迁移到 admin。
-
-文件系统旧布局迁移由脚本处理：
-
-```bash
-cd backend
-PYTHONPATH=. python scripts/migrate_user_isolation.py --dry-run
-PYTHONPATH=. python scripts/migrate_user_isolation.py --user-id <target-user-id>
-```
-
-迁移脚本覆盖 legacy `memory.json`、`threads/` 和 `agents/` 到 per-user layout。
-
-## 安全不变量
-
-必须长期保持的不变量：
-
-- JWT 只在 HttpOnly cookie 中传输，不出现在响应 JSON。
-- 任何非 public HTTP 路由都不能只靠“cookie 存在”放行，必须严格验证 JWT。
-- `token_version` 不匹配必须拒绝，保证改密码 / reset 后旧 session 失效。
-- 客户端 metadata 中的 `user_id` / `owner_id` 必须剥离。
-- repository 默认 `AUTO` 必须从当前用户上下文解析，不能静默退化成全局查询。
-- 只有迁移脚本和 admin CLI 可以显式传 `user_id=None` 绕过隔离。
-- 本地文件路径必须通过 `Paths` 和 sandbox path validation 解析，不能拼接未校验的用户输入。
-- 捕获认证、迁移、后台任务异常必须记录日志；不能空 catch。
-
-## 已知边界
-
-| 边界 | 当前行为 | 后续方向 |
-|---|---|---|
-| 无 admin 时注册普通用户 | 允许注册普通 `user` | 如产品要求先初始化 admin，给 `/register` 加 gate |
-| 登录限速 | 进程内 dict，单 worker 精确，多 worker 近似 | Redis / DB-backed rate limiter |
-| OAuth | 端点占位，未实现 | 接入 provider 并统一 `token_version` / role 语义 |
-| IM 用户隔离 | channel 使用 `default` 内部用户 | 建立外部用户到 DeerFlow user 的映射 |
-| 绝对 memory path | 显式共享 memory | UI / docs 明确提示 opt-out 风险 |
-
-## 相关文件
-
-| 文件 | 职责 |
-|---|---|
-| `app/gateway/auth_middleware.py` | 全局认证门、JWT 严格验证、写入 user context |
-| `app/gateway/csrf_middleware.py` | CSRF double-submit 和 auth Origin 校验 |
-| `app/gateway/routers/auth.py` | initialize/login/register/logout/me/change-password |
-| `app/gateway/auth/jwt.py` | JWT 创建与解析 |
-| `app/gateway/auth/reset_admin.py` | 密码 reset CLI |
-| `app/gateway/auth/credential_file.py` | 0600 凭据文件写入 |
-| `app/gateway/authz.py` | 路由权限与 owner check |
-| `deerflow/runtime/user_context.py` | 当前用户 ContextVar 与 `AUTO` sentinel |
-| `deerflow/persistence/thread_meta/` | thread metadata owner filter |
-| `deerflow/config/paths.py` | per-user filesystem layout |
-| `deerflow/agents/middlewares/thread_data_middleware.py` | run 时解析用户线程目录 |
-| `deerflow/agents/memory/storage.py` | per-user memory storage |
-| `deerflow/config/agents_config.py` | per-user custom agents |
-| `app/channels/manager.py` | IM channel 内部认证调用 |
-| `scripts/migrate_user_isolation.py` | legacy 数据迁移到 per-user layout |
-| `.deer-flow/data/deerflow.db` | 统一 SQLite 数据库，包含 users / threads_meta / runs / feedback 等表 |
-| `.deer-flow/users/{user_id}/agents/{agent_name}/` | 用户自定义 agent 配置、SOUL 和 agent memory |
-| `.deer-flow/admin_initial_credentials.txt` | `reset_admin` 生成的新凭据文件（0600，读完应删除） |

backend/docs/AUTH_TEST_DOCKER_GAP.md

@@ -24,11 +24,11 @@ All other test plan sections were executed against either:
 
 | Case | Title | What it covers | Why not run |
 |---|---|---|---|
-| TC-DOCKER-01 | `deerflow.db` volume persistence | Verify the `DEER_FLOW_HOME` bind mount survives container restart | needs `docker compose up` |
+| TC-DOCKER-01 | `users.db` volume persistence | Verify the `DEER_FLOW_HOME` bind mount survives container restart | needs `docker compose up` |
 | TC-DOCKER-02 | Session persistence across container restart | `AUTH_JWT_SECRET` env var keeps cookies valid after `docker compose down && up` | needs `docker compose down/up` |
 | TC-DOCKER-03 | Per-worker rate limiter divergence | Confirms in-process `_login_attempts` dict doesn't share state across `gunicorn` workers (4 by default in the compose file); known limitation, documented | needs multi-worker container |
-| TC-DOCKER-04 | IM channels use internal Gateway auth | Verify Feishu/Slack/Telegram dispatchers attach the process-local internal auth header plus CSRF cookie/header when calling Gateway-compatible LangGraph APIs | needs `docker logs` |
+| TC-DOCKER-04 | IM channels skip AuthMiddleware | Verify Feishu/Slack/Telegram dispatchers run in-container against `http://langgraph:2024` without going through nginx | needs `docker logs` |
-| TC-DOCKER-05 | Reset credentials surfacing | `reset_admin` writes a 0600 credential file in `DEER_FLOW_HOME` instead of logging plaintext. The file-based behavior is validated by non-Docker reset tests, so the only Docker-specific gap is verifying the volume mount carries the file out to the host | needs container + host volume |
+| TC-DOCKER-05 | Admin credentials surfacing | **Updated post-simplify** — was "log scrape", now "0600 credential file in `DEER_FLOW_HOME`". The file-based behavior is already validated by TC-1.1 + TC-UPG-13 on sg_dev (non-Docker), so the only Docker-specific gap is verifying the volume mount carries the file out to the host | needs container + host volume |
 | TC-DOCKER-06 | Gateway-mode Docker deploy | `./scripts/deploy.sh --gateway` produces a 3-container topology (no `langgraph` container); same auth flow as standard mode | needs `docker compose --profile gateway` |
 
 ## Coverage already provided by non-Docker tests
@@ -41,8 +41,8 @@ the test cases that ran on sg_dev or local:
 | TC-DOCKER-01 (volume persistence) | TC-REENT-01 on sg_dev (admin row survives gateway restart) — same SQLite file, just no container layer between |
 | TC-DOCKER-02 (session persistence) | TC-API-02/03/06 (cookie roundtrip), plus TC-REENT-04 (multi-cookie) — JWT verification is process-state-free, container restart is equivalent to `pkill uvicorn && uv run uvicorn` |
 | TC-DOCKER-03 (per-worker rate limit) | TC-GW-04 + TC-REENT-09 (single-worker rate limit + 5min expiry). The cross-worker divergence is an architectural property of the in-memory dict; no auth code path differs |
-| TC-DOCKER-04 (IM channels use internal auth) | Code-level: `app/channels/manager.py` creates the `langgraph_sdk` client with `create_internal_auth_headers()` plus CSRF cookie/header, so channel workers do not rely on browser cookies |
+| TC-DOCKER-04 (IM channels skip auth) | Code-level only: `app/channels/manager.py` uses `langgraph_sdk` directly with no cookie handling. The langgraph_auth handler is bypassed by going through SDK, not HTTP |
-| TC-DOCKER-05 (credential surfacing) | `reset_admin` writes `.deer-flow/admin_initial_credentials.txt` with mode 0600 and logs only the path — the only Docker-unique step is whether the bind mount projects this path onto the host, which is a `docker compose` config check, not a runtime behavior change |
+| TC-DOCKER-05 (credential surfacing) | TC-1.1 on sg_dev (file at `~/deer-flow/backend/.deer-flow/admin_initial_credentials.txt`, mode 0600, password 22 chars) — the only Docker-unique step is whether the bind mount projects this path onto the host, which is a `docker compose` config check, not a runtime behavior change |
 | TC-DOCKER-06 (gateway-mode container) | Section 七 7.2 covered by TC-GW-01..05 + Section 二 (gateway-mode auth flow on sg_dev) — same Gateway code, container is just a packaging change |
 
 ## Reproduction steps when Docker becomes available
@@ -72,6 +72,6 @@ Then run TC-DOCKER-01..06 from the test plan as written.
   about *container packaging* details (bind mounts, multi-worker, log
   collection), not about whether the auth code paths work.
 - **TC-DOCKER-05 was updated in place** in `AUTH_TEST_PLAN.md` to reflect
-  the current reset flow (`reset_admin` → 0600 credentials file, no log leak).
+  the post-simplify reality (credentials file → 0600 file, no log leak).
   The old "grep 'Password:' in docker logs" expectation would have failed
   silently and given a false sense of coverage.

backend/docs/AUTH_TEST_PLAN.md

@@ -19,7 +19,7 @@
 
 ```bash
 # 清除已有数据
-rm -f backend/.deer-flow/data/deerflow.db
+rm -f backend/.deer-flow/users.db
 
 # 选择模式启动
 make dev          # 标准模式
@@ -28,11 +28,10 @@ make dev-pro      # Gateway 模式
 ```
 
 **验证点：**
-- [ ] 控制台不输出 admin 邮箱或明文密码
+- [ ] 控制台输出 admin 邮箱和随机密码
-- [ ] 控制台提示 `First boot detected — no admin account exists.`
+- [ ] 密码格式为 `secrets.token_urlsafe(16)` 的 22 字符字符串
-- [ ] 控制台提示访问 `/setup` 完成 admin 创建
+- [ ] 邮箱为 `admin@deerflow.dev`
-- [ ] `GET /api/v1/auth/setup-status` 返回 `{"needs_setup": true}`
+- [ ] 提示 `Change it after login: Settings -> Account`
-- [ ] 前端访问 `/login` 会跳转 `/setup`
 
 ### 1.2 非首次启动
 
@@ -43,8 +42,7 @@ make dev
 
 **验证点：**
 - [ ] 控制台不输出密码
-- [ ] `GET /api/v1/auth/setup-status` 返回 `{"needs_setup": false}`
+- [ ] 如果 admin 仍 `needs_setup=True`，控制台有 warning 提示
-- [ ] 已登录用户如果 `needs_setup=True`，访问 workspace 会被引导到 `/setup` 完成改邮箱 / 改密码流程
 
 ### 1.3 环境变量配置
 
@@ -78,22 +76,19 @@ make dev
 curl -s $BASE/api/v1/auth/setup-status | jq .
 ```
 
-**预期：**
+**预期：** 返回 `{"needs_setup": false}`（admin 在启动时已自动创建，`count_users() > 0`）。仅在启动完成前的极短窗口内可能返回 `true`。
-- 干净数据库且尚未初始化 admin：返回 `{"needs_setup": true}`
-- 已存在 admin：返回 `{"needs_setup": false}`
 
-#### TC-API-02: 首次初始化 Admin
+#### TC-API-02: Admin 首次登录
 
 ```bash
-curl -s -X POST $BASE/api/v1/auth/initialize \
+curl -s -X POST $BASE/api/v1/auth/login/local \
-  -H "Content-Type: application/json" \
+  -d "username=admin@deerflow.dev&password=<控制台密码>" \
-  -d '{"email":"admin@example.com","password":"AdminPass1!"}' \
   -c cookies.txt | jq .
 ```
 
 **预期：**
-- 状态码 201
+- 状态码 200
-- Body: `{"id": "...", "email": "admin@example.com", "system_role": "admin", "needs_setup": false}`
+- Body: `{"expires_in": 604800, "needs_setup": true}`
 - `cookies.txt` 包含 `access_token`（HttpOnly）和 `csrf_token`（非 HttpOnly）
 
 #### TC-API-03: 获取当前用户
@@ -102,9 +97,9 @@ curl -s -X POST $BASE/api/v1/auth/initialize \
 curl -s $BASE/api/v1/auth/me -b cookies.txt | jq .
 ```
 
-**预期：** `{"id": "...", "email": "admin@example.com", "system_role": "admin", "needs_setup": false}`
+**预期：** `{"id": "...", "email": "admin@deerflow.dev", "system_role": "admin", "needs_setup": true}`
 
-#### TC-API-04: 改密码流程
+#### TC-API-04: Setup 流程（改邮箱 + 改密码）
 
 ```bash
 CSRF=$(grep csrf_token cookies.txt | awk '{print $NF}')
@@ -112,36 +107,13 @@ curl -s -X POST $BASE/api/v1/auth/change-password \
   -b cookies.txt \
   -H "Content-Type: application/json" \
   -H "X-CSRF-Token: $CSRF" \
-  -d '{"current_password":"AdminPass1!","new_password":"NewPass123!"}' | jq .
+  -d '{"current_password":"<控制台密码>","new_password":"NewPass123!","new_email":"admin@example.com"}' | jq .
 ```
 
 **预期：**
 - 状态码 200
 - `{"message": "Password changed successfully"}`
-- 再调 `/auth/me` 仍为 `admin@example.com`，`needs_setup` 仍为 `false`
+- 再调 `/auth/me` 邮箱变为 `admin@example.com`，`needs_setup` 变为 `false`
-
-#### TC-API-04a: reset_admin 后的 Setup 流程（改邮箱 + 改密码）
-
-```bash
-cd backend
-python -m app.gateway.auth.reset_admin --email admin@example.com
-# 从 .deer-flow/admin_initial_credentials.txt 读取 reset 后密码
-
-curl -s -X POST $BASE/api/v1/auth/login/local \
-  -d "username=admin@example.com&password=<凭据文件密码>" \
-  -c cookies.txt | jq .
-
-CSRF=$(grep csrf_token cookies.txt | awk '{print $NF}')
-curl -s -X POST $BASE/api/v1/auth/change-password \
-  -b cookies.txt \
-  -H "Content-Type: application/json" \
-  -H "X-CSRF-Token: $CSRF" \
-  -d '{"current_password":"<凭据文件密码>","new_password":"AdminPass2!","new_email":"admin2@example.com"}' | jq .
-```
-
-**预期：**
-- 登录返回 `{"expires_in": 604800, "needs_setup": true}`
-- `change-password` 后 `/auth/me` 邮箱变为 `admin2@example.com`，`needs_setup` 变为 `false`
 
 #### TC-API-05: 普通用户注册
 
@@ -521,7 +493,7 @@ curl -s -X POST $BASE/api/v1/auth/register \
 
 ```bash
 # 检查数据库
-sqlite3 backend/.deer-flow/data/deerflow.db "SELECT email, password_hash FROM users LIMIT 3;"
+sqlite3 backend/.deer-flow/users.db "SELECT email, password_hash FROM users LIMIT 3;"
 ```
 
 **预期：** `password_hash` 以 `$2b$` 开头（bcrypt 格式）
@@ -534,25 +506,24 @@ sqlite3 backend/.deer-flow/data/deerflow.db "SELECT email, password_hash FROM us
 
 ### 4.1 首次登录流程
 
-#### TC-UI-01: 无 admin 时访问 workspace 跳转 setup
+#### TC-UI-01: 访问首页跳转登录
 
 1. 打开 `http://localhost:2026/workspace`
-2. **预期：** 自动跳转到 `/setup`
+2. **预期：** 自动跳转到 `/login`
 
-#### TC-UI-02: Setup 页面创建 admin
+#### TC-UI-02: Login 页面
 
-1. 输入 admin 邮箱、密码、确认密码
+1. 输入 admin 邮箱和控制台密码
-2. 点击 Create Admin Account
+2. 点击 Login
+3. **预期：** 跳转到 `/setup`（因为 `needs_setup=true`）
+
+#### TC-UI-03: Setup 页面
+
+1. 输入新邮箱、控制台密码（current）、新密码、确认密码
+2. 点击 Complete Setup
 3. **预期：** 跳转到 `/workspace`
 4. 刷新页面不跳回 `/setup`
 
-#### TC-UI-03: 已初始化后 Login 页面
-
-1. 退出登录后访问 `/login`
-2. 输入 admin 邮箱和密码
-3. 点击 Login
-4. **预期：** 跳转到 `/workspace`
-
 #### TC-UI-04: Setup 密码不匹配
 
 1. 新密码和确认密码不一致
@@ -631,7 +602,7 @@ sqlite3 backend/.deer-flow/data/deerflow.db "SELECT email, password_hash FROM us
 #### TC-UI-15: reset_admin 后重新登录
 
 1. 执行 `cd backend && python -m app.gateway.auth.reset_admin`
-2. 从 `.deer-flow/admin_initial_credentials.txt` 读取新密码并登录
+2. 使用新密码登录
 3. **预期：** 跳转到 `/setup` 页面（`needs_setup` 被重置为 true）
 4. 旧 session 已失效
 
@@ -674,28 +645,18 @@ make install
 make dev
 ```
 
-#### TC-UPG-01: 首次启动等待 admin 初始化
+#### TC-UPG-01: 首次启动创建 admin
 
 **预期：**
-- [ ] 控制台不输出 admin 邮箱或随机密码
+- [ ] 控制台输出 admin 邮箱（`admin@deerflow.dev`）和随机密码
-- [ ] 访问 `/setup` 可创建第一个 admin
 - [ ] 无报错，正常启动
 
 #### TC-UPG-02: 旧 Thread 迁移到 admin
 
 ```bash
-# 创建第一个 admin
-curl -s -X POST http://localhost:2026/api/v1/auth/initialize \
-  -H "Content-Type: application/json" \
-  -d '{"email":"admin@example.com","password":"AdminPass1!"}' \
-  -c cookies.txt
-
-# 重启一次：启动迁移只在已有 admin 的启动路径执行
-make stop && make dev
-
 # 登录 admin
 curl -s -X POST http://localhost:2026/api/v1/auth/login/local \
-  -d "username=admin@example.com&password=AdminPass1!" \
+  -d "username=admin@deerflow.dev&password=<控制台密码>" \
   -c cookies.txt
 
 # 查看 thread 列表
@@ -709,8 +670,8 @@ curl -s -X POST http://localhost:2026/api/threads/search \
 
 **预期：**
 - [ ] 返回的 thread 数量 ≥ 旧版创建的数量
-- [ ] 控制台日志有 `Migrated N orphan LangGraph thread(s) to admin`
+- [ ] 控制台日志有 `Migrated N orphaned thread(s) to admin`
-- [ ] 旧 thread 只对 admin 可见
+- [ ] 每个 thread 的 `metadata.owner_id` 都已被设为 admin 的 ID
 
 #### TC-UPG-03: 旧 Thread 内容完整
 
@@ -722,7 +683,7 @@ curl -s http://localhost:2026/api/threads/<old-thread-id> \
 
 **预期：**
 - [ ] `metadata.title` 保留原值（如 `old-thread-1`）
-- [ ] 响应不回显服务端保留的 `user_id` / `owner_id`
+- [ ] `metadata.owner_id` 已填充
 
 #### TC-UPG-04: 新用户看不到旧 Thread
 
@@ -745,19 +706,18 @@ curl -s -X POST http://localhost:2026/api/threads/search \
 
 ### 5.3 数据库 Schema 兼容
 
-#### TC-UPG-05: 无 deerflow.db 时创建 schema 但不创建默认用户
+#### TC-UPG-05: 无 users.db 时自动创建
 
 ```bash
-ls -la backend/.deer-flow/data/deerflow.db
+ls -la backend/.deer-flow/users.db
-sqlite3 backend/.deer-flow/data/deerflow.db "SELECT COUNT(*) FROM users;"
 ```
 
-**预期：** 文件存在，`sqlite3` 可查到 `users` 表含 `needs_setup`、`token_version` 列；未调用 `/initialize` 前用户数为 0
+**预期：** 文件存在，`sqlite3` 可查到 `users` 表含 `needs_setup`、`token_version` 列
 
-#### TC-UPG-06: deerflow.db WAL 模式
+#### TC-UPG-06: users.db WAL 模式
 
 ```bash
-sqlite3 backend/.deer-flow/data/deerflow.db "PRAGMA journal_mode;"
+sqlite3 backend/.deer-flow/users.db "PRAGMA journal_mode;"
 ```
 
 **预期：** 返回 `wal`
@@ -808,9 +768,9 @@ make dev
 ```
 
 **预期：**
-- [ ] 服务正常启动（忽略 `deerflow.db`，无 auth 相关代码不报错）
+- [ ] 服务正常启动（忽略 `users.db`，无 auth 相关代码不报错）
 - [ ] 旧对话数据仍然可访问
-- [ ] `deerflow.db` 文件残留但不影响运行
+- [ ] `users.db` 文件残留但不影响运行
 
 #### TC-UPG-12: 再次升级到 auth 分支
 
@@ -821,47 +781,51 @@ make dev
 ```
 
 **预期：**
-- [ ] 识别已有 `deerflow.db`，不重新创建 admin
+- [ ] 识别已有 `users.db`，不重新创建 admin
-- [ ] 旧的 admin 账号仍可登录（如果回退期间未删 `deerflow.db`）
+- [ ] 旧的 admin 账号仍可登录（如果回退期间未删 `users.db`）
 
-### 5.7 Admin 初始化与 reset_admin
+### 5.7 休眠 Admin（初始密码未使用/未更改）
 
-> 首次启动不生成默认 admin，也不在日志输出密码。忘记密码时走 `reset_admin`，新密码写入 0600 凭据文件。
+> 首次启动生成 admin + 随机密码，但运维未登录、未改密码。
+> 密码只在首次启动的控制台闪过一次，后续启动不再显示。
 
-#### TC-UPG-13: 未初始化 admin 时重启不创建默认账号
+#### TC-UPG-13: 重启后自动重置密码并打印
 
 ```bash
-rm -f backend/.deer-flow/data/deerflow.db
+# 首次启动，记录密码
+rm -f backend/.deer-flow/users.db
 make dev
+# 控制台输出密码 P0，不登录
 make stop
 
+# 隔了几天，再次启动
 make dev
-curl -s $BASE/api/v1/auth/setup-status | jq .
+# 控制台输出新密码 P1
 ```
 
 **预期：**
-- [ ] 控制台不输出密码
+- [ ] 控制台输出 `Admin account setup incomplete — password reset`
-- [ ] `setup-status` 仍为 `{"needs_setup": true}`
+- [ ] 输出新密码 P1（P0 已失效）
-- [ ] 访问 `/setup` 仍可创建第一个 admin
+- [ ] 用 P1 可以登录，P0 不可以
+- [ ] 登录后 `needs_setup=true`，跳转 `/setup`
+- [ ] `token_version` 递增（旧 session 如有也失效）
 
-#### TC-UPG-14: 密码丢失 — reset_admin 写入凭据文件
+#### TC-UPG-14: 密码丢失 — 无需 CLI，重启即可
 
 ```bash
-python -m app.gateway.auth.reset_admin --email admin@example.com
+# 忘记了控制台密码 → 直接重启服务
-ls -la backend/.deer-flow/admin_initial_credentials.txt
+make stop && make dev
-cat backend/.deer-flow/admin_initial_credentials.txt
+# 控制台自动输出新密码
 ```
 
 **预期：**
-- [ ] 命令行只输出凭据文件路径，不输出明文密码
+- [ ] 无需 `reset_admin`，重启服务即可拿到新密码
-- [ ] 凭据文件权限为 `0600`
+- [ ] `reset_admin` CLI 仍然可用作手动备选方案
-- [ ] 凭据文件包含 email + password 行
-- [ ] 该用户下次登录返回 `needs_setup=true`
 
-#### TC-UPG-15: 未初始化 admin 期间普通用户注册策略边界
+#### TC-UPG-15: 休眠 admin 期间普通用户注册
 
 ```bash
-# admin 尚不存在，普通用户尝试注册
+# admin 存在但从未登录，普通用户先注册
 curl -s -X POST $BASE/api/v1/auth/register \
   -H "Content-Type: application/json" \
   -d '{"email":"earlybird@example.com","password":"EarlyPass1!"}' \
@@ -869,11 +833,11 @@ curl -s -X POST $BASE/api/v1/auth/register \
 ```
 
 **预期：**
-- [ ] 当前代码允许注册普通用户并自动登录（201，角色为 `user`）
+- [ ] 注册成功（201），角色为 `user`
-- [ ] 但 `setup-status` 仍为 `{"needs_setup": true}`，因为 admin 仍不存在
+- [ ] 无法提权为 admin
-- [ ] 这是一个产品策略边界：若要求“必须先有 admin”，需要在 `/register` 增加 admin-exists gate
+- [ ] 普通用户的数据与 admin 隔离
 
-#### TC-UPG-16: 普通用户数据与后续 admin 隔离
+#### TC-UPG-16: 休眠 admin 不影响后续操作
 
 ```bash
 # 普通用户正常创建 thread、发消息
@@ -885,13 +849,14 @@ curl -s -X POST $BASE/api/threads \
   -d '{"metadata":{}}' | jq .thread_id
 ```
 
-**预期：** 普通用户正常创建 thread；后续 admin 创建后，搜索不到该普通用户 thread
+**预期：** 正常创建，不受休眠 admin 影响
 
-#### TC-UPG-17: reset_admin 后完成 Setup
+#### TC-UPG-17: 休眠 admin 最终完成 Setup
 
 ```bash
+# 运维终于登录
 curl -s -X POST $BASE/api/v1/auth/login/local \
-  -d "username=admin@example.com&password=<凭据文件密码>" \
+  -d "username=admin@deerflow.dev&password=<P0或P1>" \
   -c admin.txt | jq .needs_setup
 # 预期: true
 
@@ -901,7 +866,7 @@ curl -s -X POST $BASE/api/v1/auth/change-password \
   -b admin.txt \
   -H "Content-Type: application/json" \
   -H "X-CSRF-Token: $CSRF" \
-  -d '{"current_password":"<凭据文件密码>","new_password":"AdminFinal1!","new_email":"admin@real.com"}' \
+  -d '{"current_password":"<密码>","new_password":"AdminFinal1!","new_email":"admin@real.com"}' \
   -c admin.txt
 
 # 验证
@@ -911,7 +876,7 @@ curl -s $BASE/api/v1/auth/me -b admin.txt | jq '{email, needs_setup}'
 **预期：**
 - [ ] `email` 变为 `admin@real.com`
 - [ ] `needs_setup` 变为 `false`
-- [ ] 后续登录使用新密码
+- [ ] 后续重启控制台不再有 warning
 
 #### TC-UPG-18: 长期未用后 JWT 密钥轮换
 
@@ -925,8 +890,8 @@ make stop && make dev
 
 **预期：**
 - [ ] 服务正常启动
-- [ ] 账号密码仍可登录（密码存在 DB，与 JWT 密钥无关）
+- [ ] 旧密码仍可登录（密码存在 DB，与 JWT 密钥无关）
-- [ ] 旧的 JWT token 失效（密钥变了签名不匹配）
+- [ ] 旧的 JWT token 失效（密钥变了签名不匹配）— 但因为从未登录过也没有旧 token
 
 ---
 
@@ -945,7 +910,7 @@ for i in 1 2 3; do
 done
 
 # 检查 admin 数量
-sqlite3 backend/.deer-flow/data/deerflow.db \
+sqlite3 backend/.deer-flow/users.db \
   "SELECT COUNT(*) FROM users WHERE system_role='admin';"
 ```
 
@@ -1090,7 +1055,7 @@ curl -s -X POST $BASE/api/v1/auth/register \
 wait
 
 # 检查用户数
-sqlite3 backend/.deer-flow/data/deerflow.db \
+sqlite3 backend/.deer-flow/users.db \
   "SELECT COUNT(*) FROM users WHERE email='race@example.com';"
 ```
 
@@ -1200,16 +1165,13 @@ curl -s -w "%{http_code}" -X DELETE "$BASE/api/threads/$TID" \
 ```bash
 cd backend
 python -m app.gateway.auth.reset_admin
-cp .deer-flow/admin_initial_credentials.txt /tmp/deerflow-reset-p1.txt
+# 记录密码 P1
-P1=$(awk -F': ' '/^password:/ {print $2}' /tmp/deerflow-reset-p1.txt)
 
 python -m app.gateway.auth.reset_admin
-cp .deer-flow/admin_initial_credentials.txt /tmp/deerflow-reset-p2.txt
+# 记录密码 P2
-P2=$(awk -F': ' '/^password:/ {print $2}' /tmp/deerflow-reset-p2.txt)
 ```
 
 **预期：**
-- [ ] `.deer-flow/admin_initial_credentials.txt` 每次都会被重写，文件权限为 `0600`
 - [ ] P1 ≠ P2（每次生成新随机密码）
 - [ ] P1 不可用，只有 P2 有效
 - [ ] `token_version` 递增了 2
@@ -1362,8 +1324,7 @@ done
 ```bash
 GW=http://localhost:8001
 
-for path in /health /api/v1/auth/setup-status /api/v1/auth/login/local \
+for path in /health /api/v1/auth/setup-status /api/v1/auth/login/local /api/v1/auth/register; do
-            /api/v1/auth/register /api/v1/auth/initialize /api/v1/auth/logout; do
   echo "$path: $(curl -s -w '%{http_code}' -o /dev/null $GW$path)"
 done
 # 预期: 200 或 405/422（方法不对但不是 401）
@@ -1438,9 +1399,9 @@ done
 >
 > 前置条件：
 > - `.env` 中设置 `AUTH_JWT_SECRET`（否则每次容器重启 session 全部失效）
-> - `DEER_FLOW_HOME` 挂载到宿主机目录（持久化 `deerflow.db`）
+> - `DEER_FLOW_HOME` 挂载到宿主机目录（持久化 `users.db`）
 
-#### TC-DOCKER-01: deerflow.db 通过 volume 持久化
+#### TC-DOCKER-01: users.db 通过 volume 持久化
 
 ```bash
 # 启动容器
@@ -1455,13 +1416,13 @@ curl -s -X POST $BASE/api/v1/auth/register \
   -H "Content-Type: application/json" \
   -d '{"email":"docker-test@example.com","password":"DockerTest1!"}' -w "\nHTTP %{http_code}"
 
-# 检查宿主机上的 deerflow.db
+# 检查宿主机上的 users.db
-ls -la ${DEER_FLOW_HOME:-backend/.deer-flow}/data/deerflow.db
+ls -la ${DEER_FLOW_HOME:-backend/.deer-flow}/users.db
-sqlite3 ${DEER_FLOW_HOME:-backend/.deer-flow}/data/deerflow.db \
+sqlite3 ${DEER_FLOW_HOME:-backend/.deer-flow}/users.db \
   "SELECT email FROM users WHERE email='docker-test@example.com';"
 ```
 
-**预期：** deerflow.db 在宿主机 `DEER_FLOW_HOME` 目录中，查询可见刚注册的用户。
+**预期：** users.db 在宿主机 `DEER_FLOW_HOME` 目录中，查询可见刚注册的用户。
 
 #### TC-DOCKER-02: 重启容器后 session 保持
 
@@ -1505,24 +1466,22 @@ done
 
 **已知限制：** In-process rate limiter 不跨 worker 共享。生产环境如需精确限速，需要 Redis 等外部存储。
 
-#### TC-DOCKER-04: IM 渠道使用内部认证
+#### TC-DOCKER-04: IM 渠道不经过 auth
 
 ```bash
-# IM 渠道（Feishu/Slack/Telegram）在 gateway 容器内部通过 LangGraph SDK 调 Gateway
+# IM 渠道（Feishu/Slack/Telegram）在 gateway 容器内部通过 LangGraph SDK 通信
-# 请求携带 process-local internal auth header，并带匹配的 CSRF cookie/header
+# 不走 nginx，不经过 AuthMiddleware
 
 # 验证方式：检查 gateway 日志中 channel manager 的请求不包含 auth 错误
 docker logs deer-flow-gateway 2>&1 | grep -E "ChannelManager|channel" | head -10
 ```
 
-**预期：** 无 auth 相关错误。渠道不依赖浏览器 cookie；服务端通过内部认证头把请求归入 `default` 用户桶。
+**预期：** 无 auth 相关错误。渠道通过 `langgraph-sdk` 直连 LangGraph Server（`http://langgraph:2024`），不走 auth 层。
 
-#### TC-DOCKER-05: reset_admin 密码写入 0600 凭证文件（不再走日志）
+#### TC-DOCKER-05: admin 密码写入 0600 凭证文件（不再走日志）
 
 ```bash
-# 首次启动不会自动生成 admin 密码。先重置已有 admin，凭据文件写在挂载到宿主机的 DEER_FLOW_HOME 下。
+# 凭证文件写在挂载到宿主机的 DEER_FLOW_HOME 下
-docker exec deer-flow-gateway python -m app.gateway.auth.reset_admin --email docker-test@example.com
-
 ls -la ${DEER_FLOW_HOME:-backend/.deer-flow}/admin_initial_credentials.txt
 # 预期文件权限: -rw------- (0600)
 
@@ -1553,15 +1512,14 @@ sleep 15
 docker ps --filter name=deer-flow-langgraph --format '{{.Names}}' | wc -l
 # 预期: 0
 
-# auth 流程正常：未登录受保护接口返回 401
+# auth 流程正常
 curl -s -w "%{http_code}" -o /dev/null $BASE/api/models
 # 预期: 401
 
-curl -s -X POST $BASE/api/v1/auth/initialize \
+curl -s -X POST $BASE/api/v1/auth/login/local \
-  -H "Content-Type: application/json" \
+  -d "username=admin@deerflow.dev&password=<日志密码>" \
-  -d '{"email":"admin@example.com","password":"AdminPass1!"}' \
   -c cookies.txt -w "\nHTTP %{http_code}"
-# 预期: 201
+# 预期: 200
 ```
 
 ### 7.4 补充边界用例
@@ -1629,15 +1587,13 @@ curl -s -D - -X POST $BASE/api/v1/auth/login/local \
 #### TC-EDGE-05: HTTP 无 max_age / HTTPS 有 max_age
 
 ```bash
-GW=http://localhost:8001
-
 # HTTP
-curl -s -D - -X POST $GW/api/v1/auth/login/local \
+curl -s -D - -X POST $BASE/api/v1/auth/login/local \
   -d "username=admin@example.com&password=正确密码" 2>/dev/null \
   | grep "access_token=" | grep -oi "max-age=[0-9]*" || echo "NO max-age (HTTP session cookie)"
 
-# HTTPS：直连 Gateway 才能用 X-Forwarded-Proto 模拟 HTTPS；nginx 会覆盖该 header
+# HTTPS
-curl -s -D - -X POST $GW/api/v1/auth/login/local \
+curl -s -D - -X POST $BASE/api/v1/auth/login/local \
   -H "X-Forwarded-Proto: https" \
   -d "username=admin@example.com&password=正确密码" 2>/dev/null \
   | grep "access_token=" | grep -oi "max-age=[0-9]*"
@@ -1756,10 +1712,10 @@ curl -s -X POST $BASE/api/threads \
   -b cookies.txt \
   -H "Content-Type: application/json" \
   -H "X-CSRF-Token: $CSRF" \
-  -d '{"metadata":{"owner_id":"victim-user-id","user_id":"victim-user-id"}}' | jq .metadata
+  -d '{"metadata":{"owner_id":"victim-user-id"}}' | jq .metadata.owner_id
 ```
 
-**预期：** 返回的 `metadata` 不包含 `owner_id` 或 `user_id`。真实所有权写入 `threads_meta.user_id`，不从客户端 metadata 接收，也不通过 metadata 回显。
+**预期：** 返回的 `metadata.owner_id` 应为当前登录用户的 ID，不是请求中注入的 `victim-user-id`。服务端应覆盖客户端提供的 `user_id`。
 
 #### 7.5.6 HTTP Method 探测
 
@@ -1840,6 +1796,6 @@ cd backend && PYTHONPATH=. uv run pytest \
 # 核心接口冒烟
 curl -s $BASE/health                              # 200
 curl -s $BASE/api/models                          # 401 (无 cookie)
-curl -s $BASE/api/v1/auth/setup-status            # 200
+curl -s -X POST $BASE/api/v1/auth/setup-status    # 200
 curl -s $BASE/api/v1/auth/me -b cookies.txt       # 200 (有 cookie)
 ```

backend/docs/AUTH_UPGRADE.md

@@ -2,16 +2,13 @@
 
 DeerFlow 内置了认证模块。本文档面向从无认证版本升级的用户。
 
-完整设计见 [AUTH_DESIGN.md](AUTH_DESIGN.md)。
-
 ## 核心概念
 
 认证模块采用**始终强制**策略：
 
-- 首次启动时不会自动创建账号；首次访问 `/setup` 时由操作者创建第一个 admin 账号
+- 首次启动时自动创建 admin 账号，随机密码打印到控制台日志
 - 认证从一开始就是强制的，无竞争窗口
-- 已有 admin 后，服务启动时会把历史对话（升级前创建且缺少 `user_id` 的 thread）迁移到 admin 名下
+- 历史对话（升级前创建的 thread）自动迁移到 admin 名下
-- 新数据按用户隔离：thread、workspace/uploads/outputs、memory、自定义 agent 都归属当前用户
 
 ## 升级步骤
 
@@ -28,41 +25,39 @@ cd backend && make install
 make dev
 ```
 
-如果没有 admin 账号，控制台只会提示：
+控制台会输出：
 
 ```
 ============================================================
-  First boot detected — no admin account exists.
+  Admin account created on first boot
-  Visit /setup to complete admin account creation.
+  Email:    admin@deerflow.dev
+  Password: aB3xK9mN_pQ7rT2w
+  Change it after login: Settings → Account
 ============================================================
 ```
 
-首次启动不会在日志里打印随机密码，也不会写入默认 admin。这样避免启动日志泄露凭据，也避免在操作者创建账号前出现可被猜测的默认身份。
+如果未登录就重启了服务，不用担心——只要 setup 未完成，每次启动都会重置密码并重新打印到控制台。
 
-### 3. 创建 admin
+### 3. 登录
 
-访问 `http://localhost:2026/setup`，填写邮箱和密码创建第一个 admin 账号。创建成功后会自动登录并进入 workspace。
+访问 `http://localhost:2026/login`，使用控制台输出的邮箱和密码登录。
 
-如果这是从无认证版本升级，创建 admin 后重启一次服务，让启动迁移把缺少 `user_id` 的历史 thread 归属到 admin。
+### 4. 修改密码
 
-### 4. 登录
+登录后进入 Settings → Account → Change Password。
-
-后续访问 `http://localhost:2026/login`，使用已创建的邮箱和密码登录。
 
 ### 5. 添加用户（可选）
 
-其他用户通过 `/login` 页面注册，自动获得 **user** 角色。每个用户只能看到自己的对话、上传文件、输出文件、memory 和自定义 agent。
+其他用户通过 `/login` 页面注册，自动获得 **user** 角色。每个用户只能看到自己的对话。
 
 ## 安全机制
 
 | 机制 | 说明 |
 |------|------|
 | JWT HttpOnly Cookie | Token 不暴露给 JavaScript，防止 XSS 窃取 |
-| CSRF Double Submit Cookie | 受保护的 POST/PUT/PATCH/DELETE 请求需携带 `X-CSRF-Token`；登录/注册/初始化/登出走 auth 端点 Origin 校验 |
+| CSRF Double Submit Cookie | 所有 POST/PUT/DELETE 请求需携带 `X-CSRF-Token` |
 | bcrypt 密码哈希 | 密码不以明文存储 |
-| Thread owner filter | `threads_meta.user_id` 由服务端认证上下文写入，搜索、读取、更新、删除默认按当前用户过滤 |
+| 多租户隔离 | 用户只能访问自己的 thread |
-| 文件系统隔离 | 线程数据写入 `{base_dir}/users/{user_id}/threads/{thread_id}/user-data/`，sandbox 内统一映射为 `/mnt/user-data/` |
-| Memory / agent 隔离 | 用户 memory 和自定义 agent 写入 `{base_dir}/users/{user_id}/...`；旧共享 agent 只作为只读兼容回退 |
 | HTTPS 自适应 | 检测 `x-forwarded-proto`，自动设置 `Secure` cookie 标志 |
 
 ## 常见操作
@@ -79,27 +74,23 @@ python -m app.gateway.auth.reset_admin
 python -m app.gateway.auth.reset_admin --email user@example.com
 ```
 
-会把新的随机密码写入 `.deer-flow/admin_initial_credentials.txt`，文件权限为 `0600`。命令行只输出文件路径，不输出明文密码。
+会输出新的随机密码。
 
 ### 完全重置
 
-删除统一 SQLite 数据库，重启后重新访问 `/setup` 创建新 admin：
+删除用户数据库，重启后自动创建新 admin：
 
 ```bash
-rm -f backend/.deer-flow/data/deerflow.db
+rm -f backend/.deer-flow/users.db
-# 重启服务后访问 http://localhost:2026/setup
+# 重启服务，控制台输出新密码
 ```
 
 ## 数据存储
 
 | 文件 | 内容 |
 |------|------|
-| `.deer-flow/data/deerflow.db` | 统一 SQLite 数据库（users、threads_meta、runs、feedback 等应用数据） |
+| `.deer-flow/users.db` | SQLite 用户数据库（密码哈希、角色） |
-| `.deer-flow/users/{user_id}/threads/{thread_id}/user-data/` | 用户线程的 workspace、uploads、outputs |
+| `.env` 中的 `AUTH_JWT_SECRET` | JWT 签名密钥（未设置时自动生成临时密钥，重启后 session 失效） |
-| `.deer-flow/users/{user_id}/memory.json` | 用户级 memory |
-| `.deer-flow/users/{user_id}/agents/{agent_name}/` | 用户自定义 agent 配置、SOUL 和 agent memory |
-| `.deer-flow/admin_initial_credentials.txt` | `reset_admin` 生成的新凭据文件（0600，读完应删除） |
-| `.env` 中的 `AUTH_JWT_SECRET` | JWT 签名密钥（未设置时自动生成并持久化到 `.deer-flow/.jwt_secret`，重启后 session 保持） |
 
 ### 生产环境建议
 
@@ -120,21 +111,19 @@ python -c "import secrets; print(secrets.token_urlsafe(32))"
 | `/api/v1/auth/me` | GET | 获取当前用户信息 |
 | `/api/v1/auth/change-password` | POST | 修改密码 |
 | `/api/v1/auth/setup-status` | GET | 检查 admin 是否存在 |
-| `/api/v1/auth/initialize` | POST | 首次初始化第一个 admin（仅无 admin 时可调用） |
 
 ## 兼容性
 
-- **标准模式**（`make dev`）：完全兼容；无 admin 时访问 `/setup` 初始化
+- **标准模式**（`make dev`）：完全兼容，admin 自动创建
 - **Gateway 模式**（`make dev-pro`）：完全兼容
-- **Docker 部署**：完全兼容，`.deer-flow/data/deerflow.db` 需持久化卷挂载
+- **Docker 部署**：完全兼容，`.deer-flow/users.db` 需持久化卷挂载
-- **IM 渠道**（Feishu/Slack/Telegram）：通过 Gateway 内部认证通信，使用 `default` 用户桶
+- **IM 渠道**（Feishu/Slack/Telegram）：通过 LangGraph SDK 通信，不经过认证层
 - **DeerFlowClient**（嵌入式）：不经过 HTTP，不受认证影响
 
 ## 故障排查
 
 | 症状 | 原因 | 解决 |
 |------|------|------|
-| 启动后没看到密码 | 当前实现不在启动日志输出密码 | 首次安装访问 `/setup`；忘记密码用 `reset_admin` |
+| 启动后没看到密码 | admin 已存在（非首次启动） | 用 `reset_admin` 重置，或删 `users.db` |
-| `/login` 自动跳到 `/setup` | 系统还没有 admin | 在 `/setup` 创建第一个 admin |
 | 登录后 POST 返回 403 | CSRF token 缺失 | 确认前端已更新 |
-| 重启后需要重新登录 | `.jwt_secret` 文件被删除且 `.env` 未设置 `AUTH_JWT_SECRET` | 在 `.env` 中设置固定密钥 |
+| 重启后需要重新登录 | `AUTH_JWT_SECRET` 未持久化 | 在 `.env` 中设置固定密钥 |

backend/docs/README.md

@@ -8,7 +8,6 @@ This directory contains detailed documentation for the DeerFlow backend.
 |----------|-------------|
 | [ARCHITECTURE.md](ARCHITECTURE.md) | System architecture overview |
 | [API.md](API.md) | Complete API reference |
-| [AUTH_DESIGN.md](AUTH_DESIGN.md) | User authentication, CSRF, and per-user isolation design |
 | [CONFIGURATION.md](CONFIGURATION.md) | Configuration options |
 | [SETUP.md](SETUP.md) | Quick setup guide |
 
@@ -43,7 +42,6 @@ docs/
 ├── README.md                  # This file
 ├── ARCHITECTURE.md            # System architecture
 ├── API.md                     # API reference
-├── AUTH_DESIGN.md             # User authentication and isolation design
 ├── CONFIGURATION.md           # Configuration guide
 ├── SETUP.md                   # Setup instructions
 ├── FILE_UPLOAD.md             # File upload feature

backend/docs/middleware-execution-flow.md

@@ -4,22 +4,22 @@
 
 `create_deerflow_agent` 通过 `RuntimeFeatures` 组装的完整 middleware 链（默认全开时）：
 
-| # | Middleware | `before_agent` | `before_model` | `after_model` | `after_agent` | `wrap_model_call` | `wrap_tool_call` | 主 Agent | Subagent | 来源 |
+| # | Middleware | `before_agent` | `before_model` | `after_model` | `after_agent` | `wrap_tool_call` | 主 Agent | Subagent | 来源 |
-|---|-----------|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|------|
+|---|-----------|:-:|:-:|:-:|:-:|:-:|:-:|:-:|------|
-| 0 | ThreadDataMiddleware | ✓ | | | | | | ✓ | ✓ | `sandbox` |
+| 0 | ThreadDataMiddleware | ✓ | | | | | ✓ | ✓ | `sandbox` |
-| 1 | UploadsMiddleware | ✓ | | | | | | ✓ | ✗ | `sandbox` |
+| 1 | UploadsMiddleware | ✓ | | | | | ✓ | ✗ | `sandbox` |
-| 2 | SandboxMiddleware | ✓ | | | ✓ | | | ✓ | ✓ | `sandbox` |
+| 2 | SandboxMiddleware | ✓ | | | ✓ | | ✓ | ✓ | `sandbox` |
-| 3 | DanglingToolCallMiddleware | | | | | ✓ | | ✓ | ✗ | 始终开启 |
+| 3 | DanglingToolCallMiddleware | | | ✓ | | | ✓ | ✗ | 始终开启 |
-| 4 | GuardrailMiddleware | | | | | | ✓ | ✓ | ✓ | *Phase 2 纳入* |
+| 4 | GuardrailMiddleware | | | | | ✓ | ✓ | ✓ | *Phase 2 纳入* |
-| 5 | ToolErrorHandlingMiddleware | | | | | | ✓ | ✓ | ✓ | 始终开启 |
+| 5 | ToolErrorHandlingMiddleware | | | | | ✓ | ✓ | ✓ | 始终开启 |
-| 6 | SummarizationMiddleware | | ✓ | | | | | ✓ | ✗ | `summarization` |
+| 6 | SummarizationMiddleware | | | ✓ | | | ✓ | ✗ | `summarization` |
-| 7 | TodoMiddleware | | ✓ | ✓ | | ✓ | | ✓ | ✗ | `plan_mode` 参数 |
+| 7 | TodoMiddleware | | | ✓ | | | ✓ | ✗ | `plan_mode` 参数 |
-| 8 | TitleMiddleware | | | ✓ | | | | ✓ | ✗ | `auto_title` |
+| 8 | TitleMiddleware | | | ✓ | | | ✓ | ✗ | `auto_title` |
-| 9 | MemoryMiddleware | | | | ✓ | | | ✓ | ✗ | `memory` |
+| 9 | MemoryMiddleware | | | | ✓ | | ✓ | ✗ | `memory` |
-| 10 | ViewImageMiddleware | | ✓ | | | | | ✓ | ✗ | `vision` |
+| 10 | ViewImageMiddleware | | ✓ | | | | ✓ | ✗ | `vision` |
-| 11 | SubagentLimitMiddleware | | | ✓ | | | | ✓ | ✗ | `subagent` |
+| 11 | SubagentLimitMiddleware | | | ✓ | | | ✓ | ✗ | `subagent` |
-| 12 | LoopDetectionMiddleware | ✓ | | ✓ | ✓ | ✓ | | ✓ | ✗ | 始终开启 |
+| 12 | LoopDetectionMiddleware | | | ✓ | | | ✓ | ✗ | 始终开启 |
-| 13 | ClarificationMiddleware | | | | | | ✓ | ✓ | ✗ | 始终最后 |
+| 13 | ClarificationMiddleware | | | ✓ | | | ✓ | ✗ | 始终最后 |
 
 主 agent **14 个** middleware（`make_lead_agent`），subagent **4 个**（ThreadData、Sandbox、Guardrail、ToolErrorHandling）。`create_deerflow_agent` Phase 1 实现 **13 个**（Guardrail 仅支持自定义实例，无内置默认）。
 
@@ -35,7 +35,7 @@ graph TB
 
     subgraph BA ["<b>before_agent</b> 正序 0→N"]
         direction TB
-        TD["[0] ThreadData<br/>创建线程目录"] --> UL["[1] Uploads<br/>扫描上传文件"] --> SB["[2] Sandbox<br/>获取沙箱"] --> LD_BA["[12] LoopDetection<br/>清理 stale warning"]
+        TD["[0] ThreadData<br/>创建线程目录"] --> UL["[1] Uploads<br/>扫描上传文件"] --> SB["[2] Sandbox<br/>获取沙箱"]
     end
 
     subgraph BM ["<b>before_model</b> 正序 0→N"]
@@ -43,42 +43,34 @@ graph TB
         VI["[10] ViewImage<br/>注入图片 base64"]
     end
 
-    subgraph WM ["<b>wrap_model_call</b>"]
+    SB --> VI
-        direction TB
+    VI --> M["<b>MODEL</b>"]
-        DTC_WM["[3] DanglingToolCall<br/>补悬空 ToolMessage"] --> LD_WM["[12] LoopDetection<br/>注入当前 run warning"]
-    end
-
-    LD_BA --> VI
-    VI --> DTC_WM
-    LD_WM --> M["<b>MODEL</b>"]
 
     subgraph AM ["<b>after_model</b> 反序 N→0"]
         direction TB
-        LD["[12] LoopDetection<br/>检测循环/排队 warning"] --> SL["[11] SubagentLimit<br/>截断多余 task"] --> TI["[8] Title<br/>生成标题"]
+        CL["[13] Clarification<br/>拦截 ask_clarification"] --> LD["[12] LoopDetection<br/>检测循环"] --> SL["[11] SubagentLimit<br/>截断多余 task"] --> TI["[8] Title<br/>生成标题"] --> SM["[6] Summarization<br/>上下文压缩"] --> DTC["[3] DanglingToolCall<br/>补缺失 ToolMessage"]
     end
 
-    M --> LD
+    M --> CL
 
     subgraph AA ["<b>after_agent</b> 反序 N→0"]
         direction TB
-        LD_CLEAN["[12] LoopDetection<br/>清理 pending warning"] --> MEM["[9] Memory<br/>入队记忆"] --> SBR["[2] Sandbox<br/>释放沙箱"]
+        SBR["[2] Sandbox<br/>释放沙箱"] --> MEM["[9] Memory<br/>入队记忆"]
     end
 
-    TI --> LD_CLEAN
+    DTC --> SBR
-    SBR --> END(["response"])
+    MEM --> END(["response"])
 
     classDef beforeNode fill:#a0a8b5,stroke:#636b7a,color:#2d3239
     classDef modelNode fill:#b5a8a0,stroke:#7a6b63,color:#2d3239
-    classDef wrapModelNode fill:#a8a0b5,stroke:#6b637a,color:#2d3239
     classDef afterModelNode fill:#b5a0a8,stroke:#7a636b,color:#2d3239
     classDef afterAgentNode fill:#a0b5a8,stroke:#637a6b,color:#2d3239
     classDef terminalNode fill:#a8b5a0,stroke:#6b7a63,color:#2d3239
 
-    class TD,UL,SB,LD_BA,VI beforeNode
+    class TD,UL,SB,VI beforeNode
-    class DTC_WM,LD_WM wrapModelNode
     class M modelNode
-    class LD,SL,TI afterModelNode
+    class CL,LD,SL,TI,SM,DTC afterModelNode
-    class LD_CLEAN,SBR,MEM afterAgentNode
+    class SBR,MEM afterAgentNode
     class START,END terminalNode
 ```
 
@@ -90,12 +82,13 @@ sequenceDiagram
     participant TD as ThreadDataMiddleware
     participant UL as UploadsMiddleware
     participant SB as SandboxMiddleware
-    participant LD as LoopDetectionMiddleware
     participant VI as ViewImageMiddleware
-    participant DTC as DanglingToolCallMiddleware
     participant M as MODEL
+    participant CL as ClarificationMiddleware
     participant SL as SubagentLimitMiddleware
     participant TI as TitleMiddleware
+    participant SM as SummarizationMiddleware
+    participant DTC as DanglingToolCallMiddleware
     participant MEM as MemoryMiddleware
 
     U ->> TD: invoke
@@ -110,26 +103,19 @@ sequenceDiagram
     activate SB
     Note right of SB: before_agent 获取沙箱
 
-    SB ->> LD: before_agent
+    SB ->> VI: before_model
-    activate LD
-    Note right of LD: before_agent 清理同 thread 旧 run 的 pending warning
-    LD ->> VI: before_model
     activate VI
     Note right of VI: before_model 注入图片 base64
 
-    VI ->> DTC: wrap_model_call
+    VI ->> M: messages + tools
-    activate DTC
-    Note right of DTC: wrap_model_call 补悬空 ToolMessage
-    DTC ->> LD: wrap_model_call
-    Note right of LD: wrap_model_call drain 当前 run warning 并追加到末尾
-    LD ->> M: messages + tools
     activate M
-    M -->> LD: AI response
+    M -->> CL: AI response
     deactivate M
 
-    Note right of LD: after_model 检测循环；warning 入队，hard-stop 清 tool_calls
+    activate CL
-    LD -->> SL: after_model
+    Note right of CL: after_model 拦截 ask_clarification
-    deactivate LD
+    CL -->> SL: after_model
+    deactivate CL
 
     activate SL
     Note right of SL: after_model 截断多余 task
@@ -138,18 +124,22 @@ sequenceDiagram
 
     activate TI
     Note right of TI: after_model 生成标题
-    TI -->> DTC: done
+    TI -->> SM: after_model
     deactivate TI
 
+    activate SM
+    Note right of SM: after_model 上下文压缩
+    SM -->> DTC: after_model
+    deactivate SM
+
+    activate DTC
+    Note right of DTC: after_model 补缺失 ToolMessage
+    DTC -->> VI: done
     deactivate DTC
 
     VI -->> SB: done
     deactivate VI
 
-    Note right of LD: after_agent 清理当前 run 未消费 warning
-
-    Note right of MEM: after_agent 入队记忆
-
     Note right of SB: after_agent 释放沙箱
     SB -->> UL: done
     deactivate SB
@@ -157,6 +147,8 @@ sequenceDiagram
     UL -->> TD: done
     deactivate UL
 
+    Note right of MEM: after_agent 入队记忆
+
     TD -->> U: response
     deactivate TD
 ```
@@ -232,12 +224,12 @@ sequenceDiagram
     participant TD as ThreadData
     participant UL as Uploads
     participant SB as Sandbox
-    participant LD as LoopDetection
     participant VI as ViewImage
-    participant DTC as DanglingToolCall
     participant M as MODEL
+    participant CL as Clarification
     participant SL as SubagentLimit
     participant TI as Title
+    participant SM as Summarization
     participant MEM as Memory
 
     U ->> TD: invoke
@@ -246,40 +238,34 @@ sequenceDiagram
     Note right of UL: before_agent 扫描文件
     UL ->> SB: .
     Note right of SB: before_agent 获取沙箱
-    SB ->> LD: .
-    Note right of LD: before_agent 清理 stale pending warning
 
     loop 每轮对话（tool call 循环）
         SB ->> VI: .
         Note right of VI: before_model 注入图片
-        VI ->> DTC: .
+        VI ->> M: messages + tools
-        Note right of DTC: wrap_model_call 补悬空工具结果
+        M -->> CL: AI response
-        DTC ->> LD: .
+        Note right of CL: after_model 拦截 ask_clarification
-        Note right of LD: wrap_model_call 注入当前 run warning
+        CL -->> SL: .
-        LD ->> M: messages + tools
-        M -->> LD: AI response
-        Note right of LD: after_model 检测循环/排队 warning
-        LD -->> SL: .
         Note right of SL: after_model 截断多余 task
         SL -->> TI: .
         Note right of TI: after_model 生成标题
+        TI -->> SM: .
+        Note right of SM: after_model 上下文压缩
     end
 
-    Note right of LD: after_agent 清理当前 run pending warning
-    LD -->> MEM: .
-    Note right of MEM: after_agent 入队记忆
-    MEM -->> SB: .
     Note right of SB: after_agent 释放沙箱
-    SB -->> U: response
+    SB -->> MEM: .
+    Note right of MEM: after_agent 入队记忆
+    MEM -->> U: response
 ```
 
 > [!warning] 不是洋葱
-> 大部分 middleware 只用一个阶段。SandboxMiddleware 使用 `before_agent`/`after_agent` 做资源获取/释放；LoopDetectionMiddleware 也使用这两个钩子，但用途是清理 run-scoped pending warnings，不是资源生命周期对称。`before_agent` / `after_agent` 只跑一次，`before_model` / `after_model` / `wrap_model_call` 每轮循环都跑。
+> 14 个 middleware 中只有 SandboxMiddleware 有 before/after 对称（获取/释放）。其余都是单向的：要么只在 `before_*` 做事，要么只在 `after_*` 做事。`before_agent` / `after_agent` 只跑一次，`before_model` / `after_model` 每轮循环都跑。
 
 硬依赖只有 2 处：
 
 1. **ThreadData 在 Sandbox 之前** — sandbox 需要线程目录
-2. **Clarification 在列表最后** — `wrap_tool_call` 处理 `ask_clarification` 时优先拦截，并通过 `Command(goto=END)` 中断执行
+2. **Clarification 在列表最后** — `after_model` 反序时最先执行，第一个拦截 `ask_clarification`
 
 ### 结论
 
@@ -287,19 +273,19 @@ sequenceDiagram
 |---|---|---|
 | 每个 middleware | before + after 对称 | 大多只用一个钩子 |
 | 激活条 | 嵌套（外长内短） | 不嵌套（串行） |
-| 反序的意义 | 清理与初始化配对 | 影响 `after_model` / `after_agent` 的执行优先级 |
+| 反序的意义 | 清理与初始化配对 | 仅影响 after_model 的执行优先级 |
 | 典型例子 | Auth: 校验 token / 清理上下文 | ThreadData: 只创建目录，没有清理 |
 
 ## 关键设计点
 
 ### ClarificationMiddleware 为什么在列表最后？
 
-位置最后使它在工具调用包装链中优先拦截 `ask_clarification`。如果命中，它返回 `Command(goto=END)`，把格式化后的澄清问题写成 `ToolMessage` 并中断执行。
+位置最后 = `after_model` 最先执行。它需要**第一个**看到 model 输出，检查是否有 `ask_clarification` tool call。如果有，立即中断（`Command(goto=END)`），后续 middleware 的 `after_model` 不再执行。
 
 ### SandboxMiddleware 的对称性
 
 `before_agent`（正序第 3 个）获取沙箱，`after_agent`（反序第 1 个）释放沙箱。外层进入 → 外层退出，天然的洋葱对称。
 
-### LoopDetectionMiddleware 为什么同时用多个钩子？
+### 大部分 middleware 只用一个钩子
 
-`after_model` 只做检测：重复工具调用达到 warning 阈值时，把 warning 放入 `(thread_id, run_id)` 作用域的 pending 队列。真正注入发生在下一次 `wrap_model_call`：此时上一轮 `AIMessage(tool_calls)` 对应的 `ToolMessage` 已经在请求里，warning 追加在末尾，不会破坏 OpenAI/Moonshot 的 tool-call pairing。`before_agent` 清理同一 thread 下旧 run 的残留 warning，`after_agent` 清理当前 run 没被消费的 warning。
+14 个 middleware 中，只有 SandboxMiddleware 同时用了 `before_agent` + `after_agent`（获取/释放）。其余都只在一个阶段执行。洋葱模型的反序特性主要影响 `after_model` 阶段的执行顺序。

backend/packages/harness/deerflow/agents/lead_agent/agent.py

@@ -1,23 +1,3 @@
-"""Lead agent factory.
-
-INVARIANT — tracing callback placement
-======================================
-
-Tracing callbacks (Langfuse, LangSmith) are attached at the **graph
-invocation root** in :func:`_make_lead_agent` (see the
-``build_tracing_callbacks()`` block that appends to ``config["callbacks"]``).
-Every ``create_chat_model(...)`` call inside this module — and inside any
-middleware reachable from this graph (e.g. ``TitleMiddleware``) — MUST pass
-``attach_tracing=False``.
-
-Forgetting that flag emits duplicate spans (one rooted at the graph, one at
-the model) AND prevents the Langfuse handler's ``propagate_attributes``
-path from firing, so ``session_id`` / ``user_id`` never reach the trace.
-The four current sites are: bootstrap agent, default agent, summarization
-middleware, and the async path inside ``TitleMiddleware``. Any new in-graph
-``create_chat_model`` call must add to this list and pass the flag.
-"""
-
 import logging
 
 from langchain.agents import create_agent
@@ -42,7 +22,6 @@ from deerflow.config.app_config import AppConfig, get_app_config
 from deerflow.models import create_chat_model
 from deerflow.skills.tool_policy import filter_tools_by_skill_allowed_tools
 from deerflow.skills.types import Skill
-from deerflow.tracing import build_tracing_callbacks
 
 logger = logging.getLogger(__name__)
 
@@ -94,14 +73,10 @@ def _create_summarization_middleware(*, app_config: AppConfig | None = None) ->
     # Bind "middleware:summarize" tag so RunJournal identifies these LLM calls
     # as middleware rather than lead_agent (SummarizationMiddleware is a
     # LangChain built-in, so we tag the model at creation time).
-    # attach_tracing=False because the graph-level RunnableConfig (set in
-    # ``_make_lead_agent``) already carries tracing callbacks; binding them
-    # again at the model level would emit duplicate spans and break
-    # ``session_id`` / ``user_id`` propagation.
     if config.model_name:
-        model = create_chat_model(name=config.model_name, thinking_enabled=False, app_config=resolved_app_config, attach_tracing=False)
+        model = create_chat_model(name=config.model_name, thinking_enabled=False, app_config=resolved_app_config)
     else:
-        model = create_chat_model(thinking_enabled=False, app_config=resolved_app_config, attach_tracing=False)
+        model = create_chat_model(thinking_enabled=False, app_config=resolved_app_config)
     model = model.with_config(tags=["middleware:summarize"])
 
     # Prepare kwargs
@@ -433,26 +408,13 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
         }
     )
 
-    # Inject tracing callbacks at the graph invocation root so a single LangGraph
-    # run produces one trace with all node / LLM / tool calls as child spans,
-    # AND so the Langfuse handler sees ``on_chain_start(parent_run_id=None)`` and
-    # actually propagates ``langfuse_session_id`` / ``langfuse_user_id`` from
-    # ``config["metadata"]`` onto the trace. Without root-level attachment the
-    # model is a nested observation and the handler strips ``langfuse_*`` keys.
-    tracing_callbacks = build_tracing_callbacks()
-    if tracing_callbacks:
-        existing = config.get("callbacks") or []
-        if not isinstance(existing, list):
-            existing = list(existing)
-        config["callbacks"] = [*existing, *tracing_callbacks]
-
     skills_for_tool_policy = _load_enabled_skills_for_tool_policy(available_skills, app_config=resolved_app_config)
 
     if is_bootstrap:
         # Special bootstrap agent with minimal prompt for initial custom agent creation flow
         tools = get_available_tools(model_name=model_name, subagent_enabled=subagent_enabled, app_config=resolved_app_config) + [setup_agent]
         return create_agent(
-            model=create_chat_model(name=model_name, thinking_enabled=thinking_enabled, app_config=resolved_app_config, attach_tracing=False),
+            model=create_chat_model(name=model_name, thinking_enabled=thinking_enabled, app_config=resolved_app_config),
             tools=filter_tools_by_skill_allowed_tools(tools, skills_for_tool_policy),
             middleware=_build_middlewares(config, model_name=model_name, app_config=resolved_app_config),
             system_prompt=apply_prompt_template(
@@ -470,7 +432,7 @@ def _make_lead_agent(config: RunnableConfig, *, app_config: AppConfig):
     # Default lead agent (unchanged behavior)
     tools = get_available_tools(model_name=model_name, groups=agent_config.tool_groups if agent_config else None, subagent_enabled=subagent_enabled, app_config=resolved_app_config)
     return create_agent(
-        model=create_chat_model(name=model_name, thinking_enabled=thinking_enabled, reasoning_effort=reasoning_effort, app_config=resolved_app_config, attach_tracing=False),
+        model=create_chat_model(name=model_name, thinking_enabled=thinking_enabled, reasoning_effort=reasoning_effort, app_config=resolved_app_config),
         tools=filter_tools_by_skill_allowed_tools(tools + extra_tools, skills_for_tool_policy),
         middleware=_build_middlewares(config, model_name=model_name, agent_name=agent_name, app_config=resolved_app_config),
         system_prompt=apply_prompt_template(

backend/packages/harness/deerflow/agents/memory/queue.py

@@ -40,15 +40,6 @@ class MemoryUpdateQueue:
         self._timer: threading.Timer | None = None
         self._processing = False
 
-    @staticmethod
-    def _queue_key(
-        thread_id: str,
-        user_id: str | None,
-        agent_name: str | None,
-    ) -> tuple[str, str | None, str | None]:
-        """Return the debounce identity for a memory update target."""
-        return (thread_id, user_id, agent_name)
-
     def add(
         self,
         thread_id: str,
@@ -124,9 +115,8 @@ class MemoryUpdateQueue:
         correction_detected: bool,
         reinforcement_detected: bool,
     ) -> None:
-        queue_key = self._queue_key(thread_id, user_id, agent_name)
         existing_context = next(
-            (context for context in self._queue if self._queue_key(context.thread_id, context.user_id, context.agent_name) == queue_key),
+            (context for context in self._queue if context.thread_id == thread_id),
             None,
         )
         merged_correction_detected = correction_detected or (existing_context.correction_detected if existing_context is not None else False)
@@ -140,7 +130,7 @@ class MemoryUpdateQueue:
             reinforcement_detected=merged_reinforcement_detected,
         )
 
-        self._queue = [context for context in self._queue if self._queue_key(context.thread_id, context.user_id, context.agent_name) != queue_key]
+        self._queue = [c for c in self._queue if c.thread_id != thread_id]
         self._queue.append(context)
 
     def _reset_timer(self) -> None:

backend/packages/harness/deerflow/agents/memory/summarization_hook.py

@@ -6,7 +6,6 @@ from deerflow.agents.memory.message_processing import detect_correction, detect_
 from deerflow.agents.memory.queue import get_memory_queue
 from deerflow.agents.middlewares.summarization_middleware import SummarizationEvent
 from deerflow.config.memory_config import get_memory_config
-from deerflow.runtime.user_context import resolve_runtime_user_id
 
 
 def memory_flush_hook(event: SummarizationEvent) -> None:
@@ -22,13 +21,11 @@ def memory_flush_hook(event: SummarizationEvent) -> None:
 
     correction_detected = detect_correction(filtered_messages)
     reinforcement_detected = not correction_detected and detect_reinforcement(filtered_messages)
-    user_id = resolve_runtime_user_id(event.runtime)
     queue = get_memory_queue()
     queue.add_nowait(
         thread_id=event.thread_id,
         messages=filtered_messages,
         agent_name=event.agent_name,
-        user_id=user_id,
         correction_detected=correction_detected,
         reinforcement_detected=reinforcement_detected,
     )

backend/packages/harness/deerflow/agents/memory/updater.py

@@ -338,7 +338,7 @@ class MemoryUpdater:
             reinforcement_detected=reinforcement_detected,
         )
         prompt = MEMORY_UPDATE_PROMPT.format(
-            current_memory=json.dumps(current_memory, indent=2, ensure_ascii=False),
+            current_memory=json.dumps(current_memory, indent=2),
             conversation=conversation_text,
             correction_hint=correction_hint,
         )

backend/packages/harness/deerflow/agents/middlewares/dangling_tool_call_middleware.py

@@ -36,22 +36,13 @@ class DanglingToolCallMiddleware(AgentMiddleware[AgentState]):
 
     @staticmethod
     def _message_tool_calls(msg) -> list[dict]:
-        """Return normalized tool calls from structured fields or raw provider payloads.
+        """Return normalized tool calls from structured fields or raw provider payloads."""
-
-        LangChain stores malformed provider function calls in ``invalid_tool_calls``.
-        They do not execute, but provider adapters may still serialize enough of
-        the call id/name back into the next request that strict OpenAI-compatible
-        validators expect a matching ToolMessage. Treat them as dangling calls so
-        the next model request stays well-formed and the model sees a recoverable
-        tool error instead of another provider 400.
-        """
-        normalized: list[dict] = []
-
         tool_calls = getattr(msg, "tool_calls", None) or []
-        normalized.extend(list(tool_calls))
+        if tool_calls:
+            return list(tool_calls)
 
         raw_tool_calls = (getattr(msg, "additional_kwargs", None) or {}).get("tool_calls") or []
-        if not tool_calls:
+        normalized: list[dict] = []
         for raw_tc in raw_tool_calls:
             if not isinstance(raw_tc, dict):
                 continue
@@ -79,86 +70,59 @@ class DanglingToolCallMiddleware(AgentMiddleware[AgentState]):
                 }
             )
 
-        for invalid_tc in getattr(msg, "invalid_tool_calls", None) or []:
-            if not isinstance(invalid_tc, dict):
-                continue
-            normalized.append(
-                {
-                    "id": invalid_tc.get("id"),
-                    "name": invalid_tc.get("name") or "unknown",
-                    "args": {},
-                    "invalid": True,
-                    "error": invalid_tc.get("error"),
-                }
-            )
-
         return normalized
 
-    @staticmethod
-    def _synthetic_tool_message_content(tool_call: dict) -> str:
-        if tool_call.get("invalid"):
-            error = tool_call.get("error")
-            if isinstance(error, str) and error:
-                return f"[Tool call could not be executed because its arguments were invalid: {error}]"
-            return "[Tool call could not be executed because its arguments were invalid.]"
-        return "[Tool call was interrupted and did not return a result.]"
-
     def _build_patched_messages(self, messages: list) -> list | None:
-        """Return messages with tool results grouped after their tool-call AIMessage.
+        """Return a new message list with patches inserted at the correct positions.
 
-        This normalizes model-bound causal order before provider serialization while
+        For each AIMessage with dangling tool_calls (no corresponding ToolMessage),
-        preserving already-valid transcripts unchanged.
+        a synthetic ToolMessage is inserted immediately after that AIMessage.
+        Returns None if no patches are needed.
         """
-        tool_messages_by_id: dict[str, ToolMessage] = {}
+        # Collect IDs of all existing ToolMessages
+        existing_tool_msg_ids: set[str] = set()
         for msg in messages:
             if isinstance(msg, ToolMessage):
-                tool_messages_by_id.setdefault(msg.tool_call_id, msg)
+                existing_tool_msg_ids.add(msg.tool_call_id)
 
-        tool_call_ids: set[str] = set()
+        # Check if any patching is needed
+        needs_patch = False
         for msg in messages:
             if getattr(msg, "type", None) != "ai":
                 continue
             for tc in self._message_tool_calls(msg):
                 tc_id = tc.get("id")
-                if tc_id:
+                if tc_id and tc_id not in existing_tool_msg_ids:
-                    tool_call_ids.add(tc_id)
+                    needs_patch = True
+                    break
+            if needs_patch:
+                break
 
+        if not needs_patch:
+            return None
+
+        # Build new list with patches inserted right after each dangling AIMessage
         patched: list = []
-        consumed_tool_msg_ids: set[str] = set()
+        patched_ids: set[str] = set()
         patch_count = 0
         for msg in messages:
-            if isinstance(msg, ToolMessage) and msg.tool_call_id in tool_call_ids:
-                continue
-
             patched.append(msg)
             if getattr(msg, "type", None) != "ai":
                 continue
-
             for tc in self._message_tool_calls(msg):
                 tc_id = tc.get("id")
-                if not tc_id or tc_id in consumed_tool_msg_ids:
+                if tc_id and tc_id not in existing_tool_msg_ids and tc_id not in patched_ids:
-                    continue
-
-                existing_tool_msg = tool_messages_by_id.get(tc_id)
-                if existing_tool_msg is not None:
-                    patched.append(existing_tool_msg)
-                    consumed_tool_msg_ids.add(tc_id)
-                else:
                     patched.append(
                         ToolMessage(
-                            content=self._synthetic_tool_message_content(tc),
+                            content="[Tool call was interrupted and did not return a result.]",
                             tool_call_id=tc_id,
                             name=tc.get("name", "unknown"),
                             status="error",
                         )
                     )
-                    consumed_tool_msg_ids.add(tc_id)
+                    patched_ids.add(tc_id)
                     patch_count += 1
 
-        if patched == messages:
-            return None
-
-        if patch_count:
         logger.warning(f"Injecting {patch_count} placeholder ToolMessage(s) for dangling tool calls")
         return patched
 

backend/packages/harness/deerflow/agents/middlewares/loop_detection_middleware.py

@@ -6,36 +6,10 @@ arguments indefinitely until the recursion limit kills the run.
 Detection strategy:
   1. After each model response, hash the tool calls (name + args).
   2. Track recent hashes in a sliding window.
-  3. If the same hash appears >= warn_threshold times, queue a
+  3. If the same hash appears >= warn_threshold times, inject a
-     "you are repeating yourself — wrap up" warning for the current
+     "you are repeating yourself — wrap up" system message (once per hash).
-     thread/run. The warning is **injected at the next model call** (in
-     ``wrap_model_call``) as a ``HumanMessage`` appended to the message
-     list, *after* all ToolMessage responses to the previous
-     AIMessage(tool_calls).
   4. If it appears >= hard_limit times, strip all tool_calls from the
      response so the agent is forced to produce a final text answer.
-
-Why the warning is injected at ``wrap_model_call`` instead of
-``after_model``:
-
-  ``after_model`` fires immediately after the model emits an
-  ``AIMessage`` that may carry ``tool_calls``. The tools node has not
-  run yet, so no matching ``ToolMessage`` exists in the history. Any
-  message we add here lands *between* the assistant's tool_calls and
-  their responses. OpenAI/Moonshot reject the next request with
-  ``"tool_call_ids did not have response messages"`` because their
-  validators require the assistant's tool_calls to be followed
-  immediately by tool messages. Anthropic also disallows mid-stream
-  ``SystemMessage``. By deferring the warning to ``wrap_model_call``,
-  every prior ToolMessage is already present in the request's message
-  list and the warning is appended at the end — pairing intact, no
-  ``AIMessage`` semantics are mutated.
-
-Queued warnings are intentionally transient. If a run ends before the
-next model request drains a queued warning, ``after_agent`` drops it
-instead of carrying it into a later invocation for the same thread. The
-hard-stop path still forces termination when the configured safety limit
-is reached.
 """
 
 from __future__ import annotations
@@ -45,14 +19,11 @@ import json
 import logging
 import threading
 from collections import OrderedDict, defaultdict
-from collections.abc import Awaitable, Callable
 from copy import deepcopy
 from typing import TYPE_CHECKING, override
 
 from langchain.agents import AgentState
 from langchain.agents.middleware import AgentMiddleware
-from langchain.agents.middleware.types import ModelCallResult, ModelRequest, ModelResponse
-from langchain_core.messages import HumanMessage
 from langgraph.runtime import Runtime
 
 if TYPE_CHECKING:
@@ -67,7 +38,6 @@ _DEFAULT_WINDOW_SIZE = 20  # track last N tool calls
 _DEFAULT_MAX_TRACKED_THREADS = 100  # LRU eviction limit
 _DEFAULT_TOOL_FREQ_WARN = 30  # warn after 30 calls to the same tool type
 _DEFAULT_TOOL_FREQ_HARD_LIMIT = 50  # force-stop after 50 calls to the same tool type
-_MAX_PENDING_WARNINGS_PER_RUN = 4
 
 
 def _normalize_tool_call_args(raw_args: object) -> tuple[dict, str | None]:
@@ -225,12 +195,6 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
         self._warned: dict[str, set[str]] = defaultdict(set)
         self._tool_freq: dict[str, dict[str, int]] = defaultdict(lambda: defaultdict(int))
         self._tool_freq_warned: dict[str, set[str]] = defaultdict(set)
-        # Per-thread/run queue of warnings to inject at the next model call.
-        # Populated by ``after_model`` (detection) and drained by
-        # ``wrap_model_call`` (injection); see module docstring.
-        self._pending_warnings: dict[tuple[str, str], list[str]] = defaultdict(list)
-        self._pending_warning_touch_order: OrderedDict[tuple[str, str], None] = OrderedDict()
-        self._max_pending_warning_keys = max(1, self.max_tracked_threads * 2)
 
     @classmethod
     def from_config(cls, config: LoopDetectionConfig) -> LoopDetectionMiddleware:
@@ -249,20 +213,9 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
         """Extract thread_id from runtime context for per-thread tracking."""
         thread_id = runtime.context.get("thread_id") if runtime.context else None
         if thread_id:
-            return str(thread_id)
+            return thread_id
         return "default"
 
-    def _get_run_id(self, runtime: Runtime) -> str:
-        """Extract run_id from runtime context for per-run warning scoping."""
-        run_id = runtime.context.get("run_id") if runtime.context else None
-        if run_id:
-            return str(run_id)
-        return "default"
-
-    def _pending_key(self, runtime: Runtime) -> tuple[str, str]:
-        """Return the pending-warning key for the current thread/run."""
-        return self._get_thread_id(runtime), self._get_run_id(runtime)
-
     def _evict_if_needed(self) -> None:
         """Evict least recently used threads if over the limit.
 
@@ -273,52 +226,8 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
             self._warned.pop(evicted_id, None)
             self._tool_freq.pop(evicted_id, None)
             self._tool_freq_warned.pop(evicted_id, None)
-            for key in list(self._pending_warnings):
-                if key[0] == evicted_id:
-                    self._drop_pending_warning_key_locked(key)
             logger.debug("Evicted loop tracking for thread %s (LRU)", evicted_id)
 
-    def _drop_pending_warning_key_locked(self, key: tuple[str, str]) -> None:
-        """Drop all pending-warning bookkeeping for one thread/run key.
-
-        Must be called while holding self._lock.
-        """
-        self._pending_warnings.pop(key, None)
-        self._pending_warning_touch_order.pop(key, None)
-
-    def _touch_pending_warning_key_locked(self, key: tuple[str, str]) -> None:
-        """Mark a pending-warning key as recently used.
-
-        Must be called while holding self._lock.
-        """
-        self._pending_warning_touch_order[key] = None
-        self._pending_warning_touch_order.move_to_end(key)
-
-    def _prune_pending_warning_state_locked(self, protected_key: tuple[str, str]) -> None:
-        """Cap pending-warning state across abnormal or concurrent runs.
-
-        Must be called while holding self._lock.
-        """
-        overflow = len(self._pending_warning_touch_order) - self._max_pending_warning_keys
-        if overflow <= 0:
-            return
-
-        candidates = [key for key in self._pending_warning_touch_order if key != protected_key]
-        for key in candidates[:overflow]:
-            self._drop_pending_warning_key_locked(key)
-
-    def _queue_pending_warning(self, runtime: Runtime, warning: str) -> None:
-        """Queue one transient warning for the current thread/run with caps."""
-        pending_key = self._pending_key(runtime)
-        with self._lock:
-            warnings = self._pending_warnings[pending_key]
-            if warning not in warnings:
-                warnings.append(warning)
-            if len(warnings) > _MAX_PENDING_WARNINGS_PER_RUN:
-                del warnings[: len(warnings) - _MAX_PENDING_WARNINGS_PER_RUN]
-            self._touch_pending_warning_key_locked(pending_key)
-            self._prune_pending_warning_state_locked(protected_key=pending_key)
-
     def _track_and_check(self, state: AgentState, runtime: Runtime) -> tuple[str | None, bool]:
         """Track tool calls and check for loops.
 
@@ -359,12 +268,6 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
             if len(history) > self.window_size:
                 history[:] = history[-self.window_size :]
 
-            warned_hashes = self._warned.get(thread_id)
-            if warned_hashes is not None:
-                warned_hashes.intersection_update(history)
-                if not warned_hashes:
-                    self._warned.pop(thread_id, None)
-
             count = history.count(call_hash)
             tool_names = [tc.get("name", "?") for tc in tool_calls]
 
@@ -478,10 +381,7 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
         warning, hard_stop = self._track_and_check(state, runtime)
 
         if hard_stop:
-            # Strip tool_calls from the last AIMessage to force text output.
+            # Strip tool_calls from the last AIMessage to force text output
-            # Once tool_calls are stripped, the AIMessage no longer requires
-            # matching ToolMessage responses, so mutating it in place here
-            # is safe for OpenAI/Moonshot pairing validators.
             messages = state.get("messages", [])
             last_msg = messages[-1]
             content = self._append_text(last_msg.content, warning or _HARD_STOP_MSG)
@@ -489,48 +389,33 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
             return {"messages": [stripped_msg]}
 
         if warning:
-            # Defer injection to the next model call. We must NOT alter the
+            # WORKAROUND for v2.0-m1 — see #2724.
-            # AIMessage(tool_calls=...) here (would put framework words in
+            #
-            # the model's mouth, polluting downstream consumers like
+            # Append the warning to the AIMessage content instead of
-            # MemoryMiddleware), nor insert a separate non-tool message
+            # injecting a separate HumanMessage. Inserting any non-tool
-            # (would break OpenAI/Moonshot tool-call pairing because the
+            # message between an AIMessage(tool_calls=...) and its
-            # tools node has not produced ToolMessage responses yet). The
+            # ToolMessage responses breaks OpenAI/Moonshot strict pairing
-            # warning is delivered via ``wrap_model_call`` below.
+            # validation ("tool_call_ids did not have response messages")
-            self._queue_pending_warning(runtime, warning)
+            # because the tools node has not run yet at after_model time.
-            return None
+            # tool_calls are preserved so the tools node still executes.
+            #
+            # This is a temporary mitigation: mutating an existing
+            # AIMessage to carry framework-authored text leaks loop-warning
+            # text into downstream consumers (MemoryMiddleware fact
+            # extraction, TitleMiddleware, telemetry, model replay) as if
+            # the model said it. The proper fix is to defer warning
+            # injection from after_model to wrap_model_call so every prior
+            # ToolMessage is already in the request — see RFC #2517 (which
+            # lists "loop intervention does not leave invalid
+            # tool-call/tool-message state" as acceptance criteria) and
+            # the prototype on `fix/loop-detection-tool-call-pairing`.
+            messages = state.get("messages", [])
+            last_msg = messages[-1]
+            patched_msg = last_msg.model_copy(update={"content": self._append_text(last_msg.content, warning)})
+            return {"messages": [patched_msg]}
 
         return None
 
-    def _clear_other_run_pending_warnings(self, runtime: Runtime) -> None:
-        """Drop stale pending warnings for previous runs in this thread."""
-        thread_id, current_run_id = self._pending_key(runtime)
-        with self._lock:
-            for key in list(self._pending_warnings):
-                if key[0] == thread_id and key[1] != current_run_id:
-                    self._drop_pending_warning_key_locked(key)
-
-    def _clear_current_run_pending_warnings(self, runtime: Runtime) -> None:
-        """Drop pending warnings owned by the current thread/run."""
-        pending_key = self._pending_key(runtime)
-        with self._lock:
-            self._drop_pending_warning_key_locked(pending_key)
-
-    @staticmethod
-    def _format_warning_message(warnings: list[str]) -> str:
-        """Merge pending warnings into one prompt message."""
-        deduped = list(dict.fromkeys(warnings))
-        return "\n\n".join(deduped)
-
-    @override
-    def before_agent(self, state: AgentState, runtime: Runtime) -> dict | None:
-        self._clear_other_run_pending_warnings(runtime)
-        return None
-
-    @override
-    async def abefore_agent(self, state: AgentState, runtime: Runtime) -> dict | None:
-        self._clear_other_run_pending_warnings(runtime)
-        return None
-
     @override
     def after_model(self, state: AgentState, runtime: Runtime) -> dict | None:
         return self._apply(state, runtime)
@@ -539,59 +424,6 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
     async def aafter_model(self, state: AgentState, runtime: Runtime) -> dict | None:
         return self._apply(state, runtime)
 
-    @override
-    def after_agent(self, state: AgentState, runtime: Runtime) -> dict | None:
-        self._clear_current_run_pending_warnings(runtime)
-        return None
-
-    @override
-    async def aafter_agent(self, state: AgentState, runtime: Runtime) -> dict | None:
-        self._clear_current_run_pending_warnings(runtime)
-        return None
-
-    def _drain_pending_warnings(self, runtime: Runtime) -> list[str]:
-        """Pop and return all queued warnings for *runtime*'s thread/run."""
-        pending_key = self._pending_key(runtime)
-        with self._lock:
-            warnings = self._pending_warnings.pop(pending_key, [])
-            self._pending_warning_touch_order.pop(pending_key, None)
-        return warnings
-
-    def _augment_request(self, request: ModelRequest) -> ModelRequest:
-        """Append queued loop warnings (if any) to the outgoing message list.
-
-        The warning is placed *after* every existing message, including the
-        ToolMessage responses to the previous AIMessage(tool_calls). This
-        keeps ``assistant tool_calls -> tool_messages`` pairing intact for
-        OpenAI/Moonshot, avoids the Anthropic mid-stream SystemMessage
-        restriction (we use HumanMessage), and never mutates an existing
-        AIMessage.
-        """
-        warnings = self._drain_pending_warnings(request.runtime)
-        if not warnings:
-            return request
-        new_messages = [
-            *request.messages,
-            HumanMessage(content=self._format_warning_message(warnings), name="loop_warning"),
-        ]
-        return request.override(messages=new_messages)
-
-    @override
-    def wrap_model_call(
-        self,
-        request: ModelRequest,
-        handler: Callable[[ModelRequest], ModelResponse],
-    ) -> ModelCallResult:
-        return handler(self._augment_request(request))
-
-    @override
-    async def awrap_model_call(
-        self,
-        request: ModelRequest,
-        handler: Callable[[ModelRequest], Awaitable[ModelResponse]],
-    ) -> ModelCallResult:
-        return await handler(self._augment_request(request))
-
     def reset(self, thread_id: str | None = None) -> None:
         """Clear tracking state. If thread_id given, clear only that thread."""
         with self._lock:
@@ -600,13 +432,8 @@ class LoopDetectionMiddleware(AgentMiddleware[AgentState]):
                 self._warned.pop(thread_id, None)
                 self._tool_freq.pop(thread_id, None)
                 self._tool_freq_warned.pop(thread_id, None)
-                for key in list(self._pending_warnings):
-                    if key[0] == thread_id:
-                        self._drop_pending_warning_key_locked(key)
             else:
                 self._history.clear()
                 self._warned.clear()
                 self._tool_freq.clear()
                 self._tool_freq_warned.clear()
-                self._pending_warnings.clear()
-                self._pending_warning_touch_order.clear()

backend/packages/harness/deerflow/agents/middlewares/title_middleware.py

@@ -160,11 +160,7 @@ class TitleMiddleware(AgentMiddleware[TitleMiddlewareState]):
         prompt, user_msg = self._build_title_prompt(state)
 
         try:
-            # attach_tracing=False because ``_get_runnable_config()`` inherits
+            model_kwargs = {"thinking_enabled": False}
-            # the graph-level RunnableConfig (set in ``_make_lead_agent``) whose
-            # callbacks already carry tracing handlers; binding them again at
-            # the model level would emit duplicate spans.
-            model_kwargs = {"thinking_enabled": False, "attach_tracing": False}
             if self._app_config is not None:
                 model_kwargs["app_config"] = self._app_config
             if config.model_name:

backend/packages/harness/deerflow/agents/middlewares/todo_middleware.py

@@ -7,21 +7,17 @@ reminder message so the model still knows about the outstanding todo list.
 
 Additionally, this middleware prevents the agent from exiting the loop while
 there are still incomplete todo items. When the model produces a final response
-(no tool calls) but todos are not yet complete, the middleware queues a reminder
+(no tool calls) but todos are not yet complete, the middleware injects a reminder
-for the next model request and jumps back to the model node to force continued
+and jumps back to the model node to force continued engagement.
-engagement. The completion reminder is injected via ``wrap_model_call`` instead
-of being persisted into graph state as a normal user-visible message.
 """
 
 from __future__ import annotations
 
-import threading
-from collections.abc import Awaitable, Callable
 from typing import Any, override
 
 from langchain.agents.middleware import TodoListMiddleware
 from langchain.agents.middleware.todo import PlanningState, Todo
-from langchain.agents.middleware.types import ModelCallResult, ModelRequest, ModelResponse, hook_config
+from langchain.agents.middleware.types import hook_config
 from langchain_core.messages import AIMessage, HumanMessage
 from langgraph.runtime import Runtime
 
@@ -59,51 +55,6 @@ def _format_todos(todos: list[Todo]) -> str:
     return "\n".join(lines)
 
 
-def _format_completion_reminder(todos: list[Todo]) -> str:
-    """Format a completion reminder for incomplete todo items."""
-    incomplete = [t for t in todos if t.get("status") != "completed"]
-    incomplete_text = "\n".join(f"- [{t.get('status', 'pending')}] {t.get('content', '')}" for t in incomplete)
-    return (
-        "<system_reminder>\n"
-        "You have incomplete todo items that must be finished before giving your final response:\n\n"
-        f"{incomplete_text}\n\n"
-        "Please continue working on these tasks. Call `write_todos` to mark items as completed "
-        "as you finish them, and only respond when all items are done.\n"
-        "</system_reminder>"
-    )
-
-
-_TOOL_CALL_FINISH_REASONS = {"tool_calls", "function_call"}
-
-
-def _has_tool_call_intent_or_error(message: AIMessage) -> bool:
-    """Return True when an AIMessage is not a clean final answer.
-
-    Todo completion reminders should only fire when the model has produced a
-    plain final response. Provider/tool parsing details have moved across
-    LangChain versions and integrations, so keep all tool-intent/error signals
-    behind this helper instead of checking one concrete field at the call site.
-    """
-    if message.tool_calls:
-        return True
-
-    if getattr(message, "invalid_tool_calls", None):
-        return True
-
-    # Backward/provider compatibility: some integrations preserve raw or legacy
-    # tool-call intent in additional_kwargs even when structured tool_calls is
-    # empty. If this helper changes, update the matching sentinel test
-    # `TestToolCallIntentOrError.test_langchain_ai_message_tool_fields_are_explicitly_handled`;
-    # if that test fails after a LangChain upgrade, review this helper so new
-    # tool-call/error fields are not silently treated as clean final answers.
-    additional_kwargs = getattr(message, "additional_kwargs", {}) or {}
-    if additional_kwargs.get("tool_calls") or additional_kwargs.get("function_call"):
-        return True
-
-    response_metadata = getattr(message, "response_metadata", {}) or {}
-    return response_metadata.get("finish_reason") in _TOOL_CALL_FINISH_REASONS
-
-
 class TodoMiddleware(TodoListMiddleware):
     """Extends TodoListMiddleware with `write_todos` context-loss detection.
 
@@ -138,7 +89,6 @@ class TodoMiddleware(TodoListMiddleware):
         formatted = _format_todos(todos)
         reminder = HumanMessage(
             name="todo_reminder",
-            additional_kwargs={"hide_from_ui": True},
             content=(
                 "<system_reminder>\n"
                 "Your todo list from earlier is no longer visible in the current context window, "
@@ -163,100 +113,6 @@ class TodoMiddleware(TodoListMiddleware):
     # Maximum number of completion reminders before allowing the agent to exit.
     # This prevents infinite loops when the agent cannot make further progress.
     _MAX_COMPLETION_REMINDERS = 2
-    # Hard cap for per-run reminder bookkeeping in long-lived middleware instances.
-    _MAX_COMPLETION_REMINDER_KEYS = 4096
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        self._lock = threading.Lock()
-        self._pending_completion_reminders: dict[tuple[str, str], list[str]] = {}
-        self._completion_reminder_counts: dict[tuple[str, str], int] = {}
-        self._completion_reminder_touch_order: dict[tuple[str, str], int] = {}
-        self._completion_reminder_next_order = 0
-
-    @staticmethod
-    def _get_thread_id(runtime: Runtime) -> str:
-        context = getattr(runtime, "context", None)
-        thread_id = context.get("thread_id") if context else None
-        return str(thread_id) if thread_id else "default"
-
-    @staticmethod
-    def _get_run_id(runtime: Runtime) -> str:
-        context = getattr(runtime, "context", None)
-        run_id = context.get("run_id") if context else None
-        return str(run_id) if run_id else "default"
-
-    def _pending_key(self, runtime: Runtime) -> tuple[str, str]:
-        return self._get_thread_id(runtime), self._get_run_id(runtime)
-
-    def _touch_completion_reminder_key_locked(self, key: tuple[str, str]) -> None:
-        self._completion_reminder_next_order += 1
-        self._completion_reminder_touch_order[key] = self._completion_reminder_next_order
-
-    def _completion_reminder_keys_locked(self) -> set[tuple[str, str]]:
-        keys = set(self._pending_completion_reminders)
-        keys.update(self._completion_reminder_counts)
-        keys.update(self._completion_reminder_touch_order)
-        return keys
-
-    def _drop_completion_reminder_key_locked(self, key: tuple[str, str]) -> None:
-        self._pending_completion_reminders.pop(key, None)
-        self._completion_reminder_counts.pop(key, None)
-        self._completion_reminder_touch_order.pop(key, None)
-
-    def _prune_completion_reminder_state_locked(self, protected_key: tuple[str, str]) -> None:
-        keys = self._completion_reminder_keys_locked()
-        overflow = len(keys) - self._MAX_COMPLETION_REMINDER_KEYS
-        if overflow <= 0:
-            return
-
-        candidates = [key for key in keys if key != protected_key]
-        candidates.sort(key=lambda key: self._completion_reminder_touch_order.get(key, 0))
-        for key in candidates[:overflow]:
-            self._drop_completion_reminder_key_locked(key)
-
-    def _queue_completion_reminder(self, runtime: Runtime, reminder: str) -> None:
-        key = self._pending_key(runtime)
-        with self._lock:
-            self._pending_completion_reminders.setdefault(key, []).append(reminder)
-            self._completion_reminder_counts[key] = self._completion_reminder_counts.get(key, 0) + 1
-            self._touch_completion_reminder_key_locked(key)
-            self._prune_completion_reminder_state_locked(protected_key=key)
-
-    def _completion_reminder_count_for_runtime(self, runtime: Runtime) -> int:
-        key = self._pending_key(runtime)
-        with self._lock:
-            return self._completion_reminder_counts.get(key, 0)
-
-    def _drain_completion_reminders(self, runtime: Runtime) -> list[str]:
-        key = self._pending_key(runtime)
-        with self._lock:
-            reminders = self._pending_completion_reminders.pop(key, [])
-            if reminders or key in self._completion_reminder_counts:
-                self._touch_completion_reminder_key_locked(key)
-            return reminders
-
-    def _clear_other_run_completion_reminders(self, runtime: Runtime) -> None:
-        thread_id, current_run_id = self._pending_key(runtime)
-        with self._lock:
-            for key in self._completion_reminder_keys_locked():
-                if key[0] == thread_id and key[1] != current_run_id:
-                    self._drop_completion_reminder_key_locked(key)
-
-    def _clear_current_run_completion_reminders(self, runtime: Runtime) -> None:
-        key = self._pending_key(runtime)
-        with self._lock:
-            self._drop_completion_reminder_key_locked(key)
-
-    @override
-    def before_agent(self, state: PlanningState, runtime: Runtime) -> dict[str, Any] | None:
-        self._clear_other_run_completion_reminders(runtime)
-        return None
-
-    @override
-    async def abefore_agent(self, state: PlanningState, runtime: Runtime) -> dict[str, Any] | None:
-        self._clear_other_run_completion_reminders(runtime)
-        return None
 
     @hook_config(can_jump_to=["model"])
     @override
@@ -281,12 +137,10 @@ class TodoMiddleware(TodoListMiddleware):
         if base_result is not None:
             return base_result
 
-        # 2. Only intervene when the agent wants to exit cleanly. Tool-call
+        # 2. Only intervene when the agent wants to exit (no tool calls).
-        # intent or tool-call parse errors should be handled by the tool path
-        # instead of being masked by todo reminders.
         messages = state.get("messages") or []
         last_ai = next((m for m in reversed(messages) if isinstance(m, AIMessage)), None)
-        if not last_ai or _has_tool_call_intent_or_error(last_ai):
+        if not last_ai or last_ai.tool_calls:
             return None
 
         # 3. Allow exit when all todos are completed or there are no todos.
@@ -295,14 +149,24 @@ class TodoMiddleware(TodoListMiddleware):
             return None
 
         # 4. Enforce a reminder cap to prevent infinite re-engagement loops.
-        if self._completion_reminder_count_for_runtime(runtime) >= self._MAX_COMPLETION_REMINDERS:
+        if _completion_reminder_count(messages) >= self._MAX_COMPLETION_REMINDERS:
             return None
 
-        # 5. Queue a reminder for the next model request and jump back. We must
+        # 5. Inject a reminder and force the agent back to the model.
-        # not persist this control prompt as a normal HumanMessage, otherwise it
+        incomplete = [t for t in todos if t.get("status") != "completed"]
-        # can leak into user-visible message streams and saved transcripts.
+        incomplete_text = "\n".join(f"- [{t.get('status', 'pending')}] {t.get('content', '')}" for t in incomplete)
-        self._queue_completion_reminder(runtime, _format_completion_reminder(todos))
+        reminder = HumanMessage(
-        return {"jump_to": "model"}
+            name="todo_completion_reminder",
+            content=(
+                "<system_reminder>\n"
+                "You have incomplete todo items that must be finished before giving your final response:\n\n"
+                f"{incomplete_text}\n\n"
+                "Please continue working on these tasks. Call `write_todos` to mark items as completed "
+                "as you finish them, and only respond when all items are done.\n"
+                "</system_reminder>"
+            ),
+        )
+        return {"jump_to": "model", "messages": [reminder]}
 
     @override
     @hook_config(can_jump_to=["model"])
@@ -313,47 +177,3 @@ class TodoMiddleware(TodoListMiddleware):
     ) -> dict[str, Any] | None:
         """Async version of after_model."""
         return self.after_model(state, runtime)
-
-    @staticmethod
-    def _format_pending_completion_reminders(reminders: list[str]) -> str:
-        return "\n\n".join(dict.fromkeys(reminders))
-
-    def _augment_request(self, request: ModelRequest) -> ModelRequest:
-        reminders = self._drain_completion_reminders(request.runtime)
-        if not reminders:
-            return request
-        new_messages = [
-            *request.messages,
-            HumanMessage(
-                content=self._format_pending_completion_reminders(reminders),
-                name="todo_completion_reminder",
-                additional_kwargs={"hide_from_ui": True},
-            ),
-        ]
-        return request.override(messages=new_messages)
-
-    @override
-    def wrap_model_call(
-        self,
-        request: ModelRequest,
-        handler: Callable[[ModelRequest], ModelResponse],
-    ) -> ModelCallResult:
-        return handler(self._augment_request(request))
-
-    @override
-    async def awrap_model_call(
-        self,
-        request: ModelRequest,
-        handler: Callable[[ModelRequest], Awaitable[ModelResponse]],
-    ) -> ModelCallResult:
-        return await handler(self._augment_request(request))
-
-    @override
-    def after_agent(self, state: PlanningState, runtime: Runtime) -> dict[str, Any] | None:
-        self._clear_current_run_completion_reminders(runtime)
-        return None
-
-    @override
-    async def aafter_agent(self, state: PlanningState, runtime: Runtime) -> dict[str, Any] | None:
-        self._clear_current_run_completion_reminders(runtime)
-        return None

backend/packages/harness/deerflow/agents/middlewares/token_usage_middleware.py

@@ -9,7 +9,7 @@ from typing import Any, override
 from langchain.agents import AgentState
 from langchain.agents.middleware import AgentMiddleware
 from langchain.agents.middleware.todo import Todo
-from langchain_core.messages import AIMessage, ToolMessage
+from langchain_core.messages import AIMessage
 from langgraph.runtime import Runtime
 
 logger = logging.getLogger(__name__)
@@ -217,17 +217,6 @@ def _infer_step_kind(message: AIMessage, actions: list[dict[str, Any]]) -> str:
     return "thinking"
 
 
-def _has_tool_call(message: AIMessage, tool_call_id: str) -> bool:
-    """Return True if the AIMessage contains a tool_call with the given id."""
-    for tc in message.tool_calls or []:
-        if isinstance(tc, dict):
-            if tc.get("id") == tool_call_id:
-                return True
-        elif hasattr(tc, "id") and tc.id == tool_call_id:
-            return True
-    return False
-
-
 def _build_attribution(message: AIMessage, todos: list[Todo]) -> dict[str, Any]:
     tool_calls = getattr(message, "tool_calls", None) or []
     actions: list[dict[str, Any]] = []
@@ -272,51 +261,8 @@ class TokenUsageMiddleware(AgentMiddleware):
         if not messages:
             return None
 
-        # Annotate subagent token usage onto the AIMessage that dispatched it.
-        # When a task tool completes, its usage is cached by tool_call_id.  Detect
-        # the ToolMessage → search backward for the corresponding AIMessage → merge.
-        # Walk backward through consecutive ToolMessages before the new AIMessage
-        # so that multiple concurrent task tool calls all get their subagent tokens
-        # written back to the same dispatch message (merging into one update).
-        state_updates: dict[int, AIMessage] = {}
-        if len(messages) >= 2:
-            from deerflow.tools.builtins.task_tool import pop_cached_subagent_usage
-
-            idx = len(messages) - 2
-            while idx >= 0:
-                tool_msg = messages[idx]
-                if not isinstance(tool_msg, ToolMessage) or not tool_msg.tool_call_id:
-                    break
-
-                subagent_usage = pop_cached_subagent_usage(tool_msg.tool_call_id)
-                if subagent_usage:
-                    # Search backward from the ToolMessage to find the AIMessage
-                    # that dispatched it.  A single model response can dispatch
-                    # multiple task tool calls, so we can't assume a fixed offset.
-                    dispatch_idx = idx - 1
-                    while dispatch_idx >= 0:
-                        candidate = messages[dispatch_idx]
-                        if isinstance(candidate, AIMessage) and _has_tool_call(candidate, tool_msg.tool_call_id):
-                            # Accumulate into an existing update for the same
-                            # AIMessage (multiple task calls in one response),
-                            # or merge fresh from the original message.
-                            existing_update = state_updates.get(dispatch_idx)
-                            prev = existing_update.usage_metadata if existing_update else (getattr(candidate, "usage_metadata", None) or {})
-                            merged = {
-                                **prev,
-                                "input_tokens": prev.get("input_tokens", 0) + subagent_usage["input_tokens"],
-                                "output_tokens": prev.get("output_tokens", 0) + subagent_usage["output_tokens"],
-                                "total_tokens": prev.get("total_tokens", 0) + subagent_usage["total_tokens"],
-                            }
-                            state_updates[dispatch_idx] = candidate.model_copy(update={"usage_metadata": merged})
-                            break
-                        dispatch_idx -= 1
-                idx -= 1
-
         last = messages[-1]
         if not isinstance(last, AIMessage):
-            if state_updates:
-                return {"messages": [state_updates[idx] for idx in sorted(state_updates)]}
             return None
 
         usage = getattr(last, "usage_metadata", None)
@@ -342,12 +288,11 @@ class TokenUsageMiddleware(AgentMiddleware):
         additional_kwargs = dict(getattr(last, "additional_kwargs", {}) or {})
 
         if additional_kwargs.get(TOKEN_USAGE_ATTRIBUTION_KEY) == attribution:
-            return {"messages": [state_updates[idx] for idx in sorted(state_updates)]} if state_updates else None
+            return None
 
         additional_kwargs[TOKEN_USAGE_ATTRIBUTION_KEY] = attribution
         updated_msg = last.model_copy(update={"additional_kwargs": additional_kwargs})
-        state_updates[len(messages) - 1] = updated_msg
+        return {"messages": [updated_msg]}
-        return {"messages": [state_updates[idx] for idx in sorted(state_updates)]}
 
     @override
     def after_model(self, state: AgentState, runtime: Runtime) -> dict | None:

backend/packages/harness/deerflow/client.py

@@ -19,7 +19,6 @@ import asyncio
 import json
 import logging
 import mimetypes
-import os
 import shutil
 import tempfile
 import uuid
@@ -43,7 +42,6 @@ from deerflow.config.paths import get_paths
 from deerflow.models import create_chat_model
 from deerflow.runtime.user_context import get_effective_user_id
 from deerflow.skills.storage import get_or_new_skill_storage
-from deerflow.tracing import build_tracing_callbacks, inject_langfuse_metadata
 from deerflow.uploads.manager import (
     claim_unique_filename,
     delete_file_safe,
@@ -125,7 +123,6 @@ class DeerFlowClient:
         agent_name: str | None = None,
         available_skills: set[str] | None = None,
         middlewares: Sequence[AgentMiddleware] | None = None,
-        environment: str | None = None,
     ):
         """Initialize the client.
 
@@ -143,12 +140,6 @@ class DeerFlowClient:
             agent_name: Name of the agent to use.
             available_skills: Optional set of skill names to make available. If None (default), all scanned skills are available.
             middlewares: Optional list of custom middlewares to inject into the agent.
-            environment: Deployment environment label that ends up in
-                ``langfuse_tags`` (e.g. ``"production"`` / ``"staging"``).
-                When ``None`` the worker/client falls back to the
-                ``DEER_FLOW_ENV`` or ``ENVIRONMENT`` env vars. Pass an
-                explicit value for programmatic callers that do not want
-                env-var coupling.
         """
         if config_path is not None:
             reload_app_config(config_path)
@@ -165,7 +156,6 @@ class DeerFlowClient:
         self._agent_name = agent_name
         self._available_skills = set(available_skills) if available_skills is not None else None
         self._middlewares = list(middlewares) if middlewares else []
-        self._environment = environment
 
         # Lazy agent — created on first call, recreated when config changes.
         self._agent = None
@@ -238,11 +228,7 @@ class DeerFlowClient:
         max_concurrent_subagents = cfg.get("max_concurrent_subagents", 3)
 
         kwargs: dict[str, Any] = {
-            # attach_tracing=False because ``stream()`` injects tracing
+            "model": create_chat_model(name=model_name, thinking_enabled=thinking_enabled),
-            # callbacks at the graph invocation root so a single embedded run
-            # produces one trace with correct session_id / user_id propagation.
-            # Attaching them again on the model would emit duplicate spans.
-            "model": create_chat_model(name=model_name, thinking_enabled=thinking_enabled, attach_tracing=False),
             "tools": self._get_tools(model_name=model_name, subagent_enabled=subagent_enabled),
             "middleware": _build_middlewares(config, model_name=model_name, agent_name=self._agent_name, custom_middlewares=self._middlewares),
             "system_prompt": apply_prompt_template(
@@ -585,28 +571,6 @@ class DeerFlowClient:
             thread_id = str(uuid.uuid4())
 
         config = self._get_runnable_config(thread_id, **kwargs)
-
-        # Inject tracing callbacks and Langfuse trace metadata at the graph
-        # invocation root so the embedded client matches the gateway worker's
-        # behaviour: a single ``stream()`` produces one trace with all node /
-        # LLM / tool calls nested under it, and the trace carries the reserved
-        # ``langfuse_session_id`` / ``langfuse_user_id`` keys that the Langfuse
-        # CallbackHandler lifts onto the root trace's ``sessionId`` / ``userId``.
-        tracing_callbacks = build_tracing_callbacks()
-        if tracing_callbacks:
-            existing_callbacks = list(config.get("callbacks") or [])
-            config["callbacks"] = [*existing_callbacks, *tracing_callbacks]
-
-        configurable = config.get("configurable") or {}
-        inject_langfuse_metadata(
-            config,
-            thread_id=thread_id,
-            user_id=get_effective_user_id(),
-            assistant_id=self._agent_name or "lead-agent",
-            model_name=configurable.get("model_name") or self._model_name,
-            environment=self._environment or os.environ.get("DEER_FLOW_ENV") or os.environ.get("ENVIRONMENT"),
-        )
-
         self._ensure_agent(config)
 
         state: dict[str, Any] = {"messages": [HumanMessage(content=message)]}

backend/packages/harness/deerflow/community/aio_sandbox/aio_sandbox.py

@@ -1,5 +1,4 @@
 import base64
-import errno
 import logging
 import shlex
 import threading
@@ -7,14 +6,11 @@ import uuid
 
 from agent_sandbox import Sandbox as AioSandboxClient
 
-from deerflow.config.paths import VIRTUAL_PATH_PREFIX
 from deerflow.sandbox.sandbox import Sandbox
 from deerflow.sandbox.search import GrepMatch, path_matches, should_ignore_path, truncate_line
 
 logger = logging.getLogger(__name__)
 
-_MAX_DOWNLOAD_SIZE = 100 * 1024 * 1024  # 100 MB
-
 _ERROR_OBSERVATION_SIGNATURE = "'ErrorObservation' object has no attribute 'exit_code'"
 
 
@@ -106,49 +102,6 @@ class AioSandbox(Sandbox):
             logger.error(f"Failed to read file in sandbox: {e}")
             return f"Error: {e}"
 
-    def download_file(self, path: str) -> bytes:
-        """Download file bytes from the sandbox.
-
-        Raises:
-            PermissionError: If the path contains '..' traversal segments or is
-                outside ``VIRTUAL_PATH_PREFIX``.
-            OSError: If the file cannot be retrieved from the sandbox.
-        """
-        # Reject path traversal before sending to the container API.
-        # LocalSandbox gets this implicitly via _resolve_path;
-        # here the path is forwarded verbatim so we must check explicitly.
-        normalised = path.replace("\\", "/")
-        for segment in normalised.split("/"):
-            if segment == "..":
-                logger.error(f"Refused download due to path traversal: {path}")
-                raise PermissionError(f"Access denied: path traversal detected in '{path}'")
-
-        stripped_path = normalised.lstrip("/")
-        allowed_prefix = VIRTUAL_PATH_PREFIX.lstrip("/")
-        if stripped_path != allowed_prefix and not stripped_path.startswith(f"{allowed_prefix}/"):
-            logger.error("Refused download outside allowed directory: path=%s, allowed_prefix=%s", path, VIRTUAL_PATH_PREFIX)
-            raise PermissionError(f"Access denied: path must be under '{VIRTUAL_PATH_PREFIX}': '{path}'")
-
-        with self._lock:
-            try:
-                chunks: list[bytes] = []
-                total = 0
-                for chunk in self._client.file.download_file(path=path):
-                    total += len(chunk)
-                    if total > _MAX_DOWNLOAD_SIZE:
-                        raise OSError(
-                            errno.EFBIG,
-                            f"File exceeds maximum download size of {_MAX_DOWNLOAD_SIZE} bytes",
-                            path,
-                        )
-                    chunks.append(chunk)
-                return b"".join(chunks)
-            except OSError:
-                raise
-            except Exception as e:
-                logger.error(f"Failed to download file in sandbox: {e}")
-                raise OSError(f"Failed to download file '{path}' from sandbox: {e}") from e
-
     def list_dir(self, path: str, max_depth: int = 2) -> list[str]:
         """List the contents of a directory in the sandbox.
 

backend/packages/harness/deerflow/community/aio_sandbox/aio_sandbox_provider.py

@@ -10,7 +10,6 @@ The provider itself handles:
 - Mount computation (thread-specific, skills)
 """
 
-import asyncio
 import atexit
 import hashlib
 import logging
@@ -19,7 +18,6 @@ import signal
 import threading
 import time
 import uuid
-from concurrent.futures import ThreadPoolExecutor
 
 try:
     import fcntl
@@ -34,7 +32,7 @@ from deerflow.sandbox.sandbox import Sandbox
 from deerflow.sandbox.sandbox_provider import SandboxProvider
 
 from .aio_sandbox import AioSandbox
-from .backend import SandboxBackend, wait_for_sandbox_ready, wait_for_sandbox_ready_async
+from .backend import SandboxBackend, wait_for_sandbox_ready
 from .local_backend import LocalContainerBackend
 from .remote_backend import RemoteSandboxBackend
 from .sandbox_info import SandboxInfo
@@ -48,9 +46,6 @@ DEFAULT_CONTAINER_PREFIX = "deer-flow-sandbox"
 DEFAULT_IDLE_TIMEOUT = 600  # 10 minutes in seconds
 DEFAULT_REPLICAS = 3  # Maximum concurrent sandbox containers
 IDLE_CHECK_INTERVAL = 60  # Check every 60 seconds
-THREAD_LOCK_EXECUTOR_WORKERS = min(32, (os.cpu_count() or 1) + 4)
-_THREAD_LOCK_EXECUTOR = ThreadPoolExecutor(max_workers=THREAD_LOCK_EXECUTOR_WORKERS, thread_name_prefix="sandbox-lock-wait")
-atexit.register(_THREAD_LOCK_EXECUTOR.shutdown, wait=False, cancel_futures=True)
 
 
 def _lock_file_exclusive(lock_file) -> None:
@@ -71,40 +66,6 @@ def _unlock_file(lock_file) -> None:
     msvcrt.locking(lock_file.fileno(), msvcrt.LK_UNLCK, 1)
 
 
-def _open_lock_file(lock_path):
-    return open(lock_path, "a", encoding="utf-8")
-
-
-async def _acquire_thread_lock_async(lock: threading.Lock) -> None:
-    """Acquire a threading.Lock without polling or using the default executor."""
-    loop = asyncio.get_running_loop()
-    acquire_future = loop.run_in_executor(_THREAD_LOCK_EXECUTOR, lock.acquire, True)
-
-    try:
-        acquired = await asyncio.shield(acquire_future)
-    except asyncio.CancelledError:
-        acquire_future.add_done_callback(lambda task: _release_cancelled_lock_acquire(lock, task))
-        raise
-
-    if not acquired:
-        raise RuntimeError("Failed to acquire sandbox thread lock")
-
-
-def _release_cancelled_lock_acquire(lock: threading.Lock, task: asyncio.Future[bool]) -> None:
-    """Release a lock acquired after its awaiting coroutine was cancelled."""
-    if task.cancelled():
-        return
-
-    try:
-        acquired = task.result()
-    except Exception as e:
-        logger.warning(f"Cancelled sandbox lock acquisition finished with error: {e}")
-        return
-
-    if acquired:
-        lock.release()
-
-
 class AioSandboxProvider(SandboxProvider):
     """Sandbox provider that manages containers running the AIO sandbox.
 
@@ -119,6 +80,7 @@ class AioSandboxProvider(SandboxProvider):
         port: 8080                      # Base port for local containers
         container_prefix: deer-flow-sandbox
         idle_timeout: 600               # Idle timeout in seconds (0 to disable)
+        auto_restart: true              # Restart crashed containers automatically
         replicas: 3                     # Max concurrent sandbox containers (LRU eviction when exceeded)
         mounts:                         # Volume mounts for local containers
           - host_path: /path/on/host
@@ -203,12 +165,14 @@ class AioSandboxProvider(SandboxProvider):
 
         idle_timeout = getattr(sandbox_config, "idle_timeout", None)
         replicas = getattr(sandbox_config, "replicas", None)
+        auto_restart = getattr(sandbox_config, "auto_restart", True)
 
         return {
             "image": sandbox_config.image or DEFAULT_IMAGE,
             "port": sandbox_config.port or DEFAULT_PORT,
             "container_prefix": sandbox_config.container_prefix or DEFAULT_CONTAINER_PREFIX,
             "idle_timeout": idle_timeout if idle_timeout is not None else DEFAULT_IDLE_TIMEOUT,
+            "auto_restart": auto_restart,
             "replicas": replicas if replicas is not None else DEFAULT_REPLICAS,
             "mounts": sandbox_config.mounts or [],
             "environment": self._resolve_env_vars(sandbox_config.environment or {}),
@@ -455,96 +419,6 @@ class AioSandboxProvider(SandboxProvider):
                 self._thread_locks[thread_id] = threading.Lock()
             return self._thread_locks[thread_id]
 
-    def _sandbox_id_for_thread(self, thread_id: str | None) -> str:
-        """Return deterministic IDs for thread sandboxes and random IDs otherwise."""
-        return self._deterministic_sandbox_id(thread_id) if thread_id else str(uuid.uuid4())[:8]
-
-    def _reuse_in_process_sandbox(self, thread_id: str | None, *, post_lock: bool = False) -> str | None:
-        """Reuse an active in-process sandbox for a thread if one is still tracked."""
-        if thread_id is None:
-            return None
-
-        with self._lock:
-            if thread_id not in self._thread_sandboxes:
-                return None
-
-            existing_id = self._thread_sandboxes[thread_id]
-            if existing_id in self._sandboxes:
-                suffix = " (post-lock check)" if post_lock else ""
-                logger.info(f"Reusing in-process sandbox {existing_id} for thread {thread_id}{suffix}")
-                self._last_activity[existing_id] = time.time()
-                return existing_id
-
-            del self._thread_sandboxes[thread_id]
-            return None
-
-    def _reclaim_warm_pool_sandbox(self, thread_id: str | None, sandbox_id: str, *, post_lock: bool = False) -> str | None:
-        """Promote a warm-pool sandbox back to active tracking if available."""
-        if thread_id is None:
-            return None
-
-        with self._lock:
-            if sandbox_id not in self._warm_pool:
-                return None
-
-            info, _ = self._warm_pool.pop(sandbox_id)
-            sandbox = AioSandbox(id=sandbox_id, base_url=info.sandbox_url)
-            self._sandboxes[sandbox_id] = sandbox
-            self._sandbox_infos[sandbox_id] = info
-            self._last_activity[sandbox_id] = time.time()
-            self._thread_sandboxes[thread_id] = sandbox_id
-
-        suffix = " (post-lock check)" if post_lock else f" at {info.sandbox_url}"
-        logger.info(f"Reclaimed warm-pool sandbox {sandbox_id} for thread {thread_id}{suffix}")
-        return sandbox_id
-
-    def _recheck_cached_sandbox(self, thread_id: str, sandbox_id: str) -> str | None:
-        """Re-check in-memory caches after acquiring the cross-process file lock."""
-        return self._reuse_in_process_sandbox(thread_id, post_lock=True) or self._reclaim_warm_pool_sandbox(thread_id, sandbox_id, post_lock=True)
-
-    def _register_discovered_sandbox(self, thread_id: str, info: SandboxInfo) -> str:
-        """Track a sandbox discovered through the backend."""
-        sandbox = AioSandbox(id=info.sandbox_id, base_url=info.sandbox_url)
-        with self._lock:
-            self._sandboxes[info.sandbox_id] = sandbox
-            self._sandbox_infos[info.sandbox_id] = info
-            self._last_activity[info.sandbox_id] = time.time()
-            self._thread_sandboxes[thread_id] = info.sandbox_id
-
-        logger.info(f"Discovered existing sandbox {info.sandbox_id} for thread {thread_id} at {info.sandbox_url}")
-        return info.sandbox_id
-
-    def _register_created_sandbox(self, thread_id: str | None, sandbox_id: str, info: SandboxInfo) -> str:
-        """Track a newly-created sandbox in the active maps."""
-        sandbox = AioSandbox(id=sandbox_id, base_url=info.sandbox_url)
-        with self._lock:
-            self._sandboxes[sandbox_id] = sandbox
-            self._sandbox_infos[sandbox_id] = info
-            self._last_activity[sandbox_id] = time.time()
-            if thread_id:
-                self._thread_sandboxes[thread_id] = sandbox_id
-
-        logger.info(f"Created sandbox {sandbox_id} for thread {thread_id} at {info.sandbox_url}")
-        return sandbox_id
-
-    def _replica_count(self) -> tuple[int, int]:
-        """Return configured replicas and currently tracked sandbox count."""
-        replicas = self._config.get("replicas", DEFAULT_REPLICAS)
-        with self._lock:
-            total = len(self._sandboxes) + len(self._warm_pool)
-        return replicas, total
-
-    def _log_replicas_soft_cap(self, replicas: int, sandbox_id: str, evicted: str | None) -> None:
-        """Log the result of enforcing the warm-pool replica budget."""
-        if evicted:
-            logger.info(f"Evicted warm-pool sandbox {evicted} to stay within replicas={replicas}")
-            return
-
-        # All slots are occupied by active sandboxes — proceed anyway and log.
-        # The replicas limit is a soft cap; we never forcibly stop a container
-        # that is actively serving a thread.
-        logger.warning(f"All {replicas} replica slots are in active use; creating sandbox {sandbox_id} beyond the soft limit")
-
     # ── Core: acquire / get / release / shutdown ─────────────────────────
 
     def acquire(self, thread_id: str | None = None) -> str:
@@ -569,23 +443,6 @@ class AioSandboxProvider(SandboxProvider):
         else:
             return self._acquire_internal(thread_id)
 
-    async def acquire_async(self, thread_id: str | None = None) -> str:
-        """Acquire a sandbox environment without blocking the event loop.
-
-        Mirrors ``acquire()`` while keeping blocking backend operations off the
-        event loop and using async-native readiness polling for newly created
-        sandboxes.
-        """
-        if thread_id:
-            thread_lock = self._get_thread_lock(thread_id)
-            await _acquire_thread_lock_async(thread_lock)
-            try:
-                return await self._acquire_internal_async(thread_id)
-            finally:
-                thread_lock.release()
-
-        return await self._acquire_internal_async(thread_id)
-
     def _acquire_internal(self, thread_id: str | None) -> str:
         """Internal sandbox acquisition with two-layer consistency.
 
@@ -594,17 +451,33 @@ class AioSandboxProvider(SandboxProvider):
                  sandbox_id is deterministic from thread_id so no shared state file
                  is needed — any process can derive the same container name)
         """
-        cached_id = self._reuse_in_process_sandbox(thread_id)
+        # ── Layer 1: In-process cache (fast path) ──
-        if cached_id is not None:
+        if thread_id:
-            return cached_id
+            with self._lock:
+                if thread_id in self._thread_sandboxes:
+                    existing_id = self._thread_sandboxes[thread_id]
+                    if existing_id in self._sandboxes:
+                        logger.info(f"Reusing in-process sandbox {existing_id} for thread {thread_id}")
+                        self._last_activity[existing_id] = time.time()
+                        return existing_id
+                    else:
+                        del self._thread_sandboxes[thread_id]
 
         # Deterministic ID for thread-specific, random for anonymous
-        sandbox_id = self._sandbox_id_for_thread(thread_id)
+        sandbox_id = self._deterministic_sandbox_id(thread_id) if thread_id else str(uuid.uuid4())[:8]
 
         # ── Layer 1.5: Warm pool (container still running, no cold-start) ──
-        reclaimed_id = self._reclaim_warm_pool_sandbox(thread_id, sandbox_id)
+        if thread_id:
-        if reclaimed_id is not None:
+            with self._lock:
-            return reclaimed_id
+                if sandbox_id in self._warm_pool:
+                    info, _ = self._warm_pool.pop(sandbox_id)
+                    sandbox = AioSandbox(id=sandbox_id, base_url=info.sandbox_url)
+                    self._sandboxes[sandbox_id] = sandbox
+                    self._sandbox_infos[sandbox_id] = info
+                    self._last_activity[sandbox_id] = time.time()
+                    self._thread_sandboxes[thread_id] = sandbox_id
+                    logger.info(f"Reclaimed warm-pool sandbox {sandbox_id} for thread {thread_id} at {info.sandbox_url}")
+                    return sandbox_id
 
         # ── Layer 2: Backend discovery + create (protected by cross-process lock) ──
         # Use a file lock so that two processes racing to create the same sandbox
@@ -615,26 +488,6 @@ class AioSandboxProvider(SandboxProvider):
 
         return self._create_sandbox(thread_id, sandbox_id)
 
-    async def _acquire_internal_async(self, thread_id: str | None) -> str:
-        """Async counterpart to ``_acquire_internal``."""
-        cached_id = self._reuse_in_process_sandbox(thread_id)
-        if cached_id is not None:
-            return cached_id
-
-        # Deterministic ID for thread-specific, random for anonymous
-        sandbox_id = self._sandbox_id_for_thread(thread_id)
-
-        # ── Layer 1.5: Warm pool (container still running, no cold-start) ──
-        reclaimed_id = self._reclaim_warm_pool_sandbox(thread_id, sandbox_id)
-        if reclaimed_id is not None:
-            return reclaimed_id
-
-        # ── Layer 2: Backend discovery + create (protected by cross-process lock) ──
-        if thread_id:
-            return await self._discover_or_create_with_lock_async(thread_id, sandbox_id)
-
-        return await self._create_sandbox_async(thread_id, sandbox_id)
-
     def _discover_or_create_with_lock(self, thread_id: str, sandbox_id: str) -> str:
         """Discover an existing sandbox or create a new one under a cross-process file lock.
 
@@ -653,50 +506,40 @@ class AioSandboxProvider(SandboxProvider):
                 locked = True
                 # Re-check in-process caches under the file lock in case another
                 # thread in this process won the race while we were waiting.
-                cached_id = self._recheck_cached_sandbox(thread_id, sandbox_id)
+                with self._lock:
-                if cached_id is not None:
+                    if thread_id in self._thread_sandboxes:
-                    return cached_id
+                        existing_id = self._thread_sandboxes[thread_id]
+                        if existing_id in self._sandboxes:
+                            logger.info(f"Reusing in-process sandbox {existing_id} for thread {thread_id} (post-lock check)")
+                            self._last_activity[existing_id] = time.time()
+                            return existing_id
+                    if sandbox_id in self._warm_pool:
+                        info, _ = self._warm_pool.pop(sandbox_id)
+                        sandbox = AioSandbox(id=sandbox_id, base_url=info.sandbox_url)
+                        self._sandboxes[sandbox_id] = sandbox
+                        self._sandbox_infos[sandbox_id] = info
+                        self._last_activity[sandbox_id] = time.time()
+                        self._thread_sandboxes[thread_id] = sandbox_id
+                        logger.info(f"Reclaimed warm-pool sandbox {sandbox_id} for thread {thread_id} (post-lock check)")
+                        return sandbox_id
 
                 # Backend discovery: another process may have created the container.
                 discovered = self._backend.discover(sandbox_id)
                 if discovered is not None:
-                    return self._register_discovered_sandbox(thread_id, discovered)
+                    sandbox = AioSandbox(id=discovered.sandbox_id, base_url=discovered.sandbox_url)
+                    with self._lock:
+                        self._sandboxes[discovered.sandbox_id] = sandbox
+                        self._sandbox_infos[discovered.sandbox_id] = discovered
+                        self._last_activity[discovered.sandbox_id] = time.time()
+                        self._thread_sandboxes[thread_id] = discovered.sandbox_id
+                    logger.info(f"Discovered existing sandbox {discovered.sandbox_id} for thread {thread_id} at {discovered.sandbox_url}")
+                    return discovered.sandbox_id
 
                 return self._create_sandbox(thread_id, sandbox_id)
             finally:
                 if locked:
                     _unlock_file(lock_file)
 
-    async def _discover_or_create_with_lock_async(self, thread_id: str, sandbox_id: str) -> str:
-        """Async counterpart to ``_discover_or_create_with_lock``."""
-        paths = get_paths()
-        user_id = get_effective_user_id()
-        await asyncio.to_thread(paths.ensure_thread_dirs, thread_id, user_id=user_id)
-        lock_path = paths.thread_dir(thread_id, user_id=user_id) / f"{sandbox_id}.lock"
-
-        lock_file = await asyncio.to_thread(_open_lock_file, lock_path)
-        locked = False
-        try:
-            await asyncio.to_thread(_lock_file_exclusive, lock_file)
-            locked = True
-            # Re-check in-process caches under the file lock in case another
-            # thread in this process won the race while we were waiting.
-            cached_id = self._recheck_cached_sandbox(thread_id, sandbox_id)
-            if cached_id is not None:
-                return cached_id
-
-            # Backend discovery is sync because local discovery may inspect
-            # Docker and perform a health check; keep it off the event loop.
-            discovered = await asyncio.to_thread(self._backend.discover, sandbox_id)
-            if discovered is not None:
-                return self._register_discovered_sandbox(thread_id, discovered)
-
-            return await self._create_sandbox_async(thread_id, sandbox_id)
-        finally:
-            if locked:
-                await asyncio.to_thread(_unlock_file, lock_file)
-            await asyncio.to_thread(lock_file.close)
-
     def _evict_oldest_warm(self) -> str | None:
         """Destroy the oldest container in the warm pool to free capacity.
 
@@ -734,10 +577,18 @@ class AioSandboxProvider(SandboxProvider):
 
         # Enforce replicas: only warm-pool containers count toward eviction budget.
         # Active sandboxes are in use by live threads and must not be forcibly stopped.
-        replicas, total = self._replica_count()
+        replicas = self._config.get("replicas", DEFAULT_REPLICAS)
+        with self._lock:
+            total = len(self._sandboxes) + len(self._warm_pool)
         if total >= replicas:
             evicted = self._evict_oldest_warm()
-            self._log_replicas_soft_cap(replicas, sandbox_id, evicted)
+            if evicted:
+                logger.info(f"Evicted warm-pool sandbox {evicted} to stay within replicas={replicas}")
+            else:
+                # All slots are occupied by active sandboxes — proceed anyway and log.
+                # The replicas limit is a soft cap; we never forcibly stop a container
+                # that is actively serving a thread.
+                logger.warning(f"All {replicas} replica slots are in active use; creating sandbox {sandbox_id} beyond the soft limit")
 
         info = self._backend.create(thread_id, sandbox_id, extra_mounts=extra_mounts or None)
 
@@ -746,43 +597,72 @@ class AioSandboxProvider(SandboxProvider):
             self._backend.destroy(info)
             raise RuntimeError(f"Sandbox {sandbox_id} failed to become ready within timeout at {info.sandbox_url}")
 
-        return self._register_created_sandbox(thread_id, sandbox_id, info)
+        sandbox = AioSandbox(id=sandbox_id, base_url=info.sandbox_url)
+        with self._lock:
+            self._sandboxes[sandbox_id] = sandbox
+            self._sandbox_infos[sandbox_id] = info
+            self._last_activity[sandbox_id] = time.time()
+            if thread_id:
+                self._thread_sandboxes[thread_id] = sandbox_id
 
-    async def _create_sandbox_async(self, thread_id: str | None, sandbox_id: str) -> str:
+        logger.info(f"Created sandbox {sandbox_id} for thread {thread_id} at {info.sandbox_url}")
-        """Async counterpart to ``_create_sandbox``."""
+        return sandbox_id
-        extra_mounts = await asyncio.to_thread(self._get_extra_mounts, thread_id)
-
-        # Enforce replicas: only warm-pool containers count toward eviction budget.
-        # Active sandboxes are in use by live threads and must not be forcibly stopped.
-        replicas, total = self._replica_count()
-        if total >= replicas:
-            evicted = await asyncio.to_thread(self._evict_oldest_warm)
-            self._log_replicas_soft_cap(replicas, sandbox_id, evicted)
-
-        info = await asyncio.to_thread(self._backend.create, thread_id, sandbox_id, extra_mounts=extra_mounts or None)
-
-        # Wait for sandbox to be ready without blocking the event loop.
-        if not await wait_for_sandbox_ready_async(info.sandbox_url, timeout=60):
-            await asyncio.to_thread(self._backend.destroy, info)
-            raise RuntimeError(f"Sandbox {sandbox_id} failed to become ready within timeout at {info.sandbox_url}")
-
-        return self._register_created_sandbox(thread_id, sandbox_id, info)
 
     def get(self, sandbox_id: str) -> Sandbox | None:
         """Get a sandbox by ID. Updates last activity timestamp.
 
+        When ``auto_restart`` is enabled (the default), the container's liveness
+        is verified on each lookup.  If the underlying container has crashed, the
+        sandbox is evicted from all caches so that the next ``acquire()`` call will
+        transparently create a fresh container.
+
         Args:
             sandbox_id: The ID of the sandbox.
 
         Returns:
-            The sandbox instance if found, None otherwise.
+            The sandbox instance if found and alive, None otherwise.
         """
         with self._lock:
             sandbox = self._sandboxes.get(sandbox_id)
-            if sandbox is not None:
+            if sandbox is None:
+                return None
             self._last_activity[sandbox_id] = time.time()
+            auto_restart = self._config.get("auto_restart", True)
+            info = self._sandbox_infos.get(sandbox_id) if auto_restart else None
+
+        if not info:
             return sandbox
 
+        if self._backend.is_alive(info):
+            return sandbox
+
+        info_to_destroy = None
+        with self._lock:
+            current_sandbox = self._sandboxes.get(sandbox_id)
+            current_info = self._sandbox_infos.get(sandbox_id)
+            if current_sandbox is None:
+                return None
+            if current_info is not info:
+                self._last_activity[sandbox_id] = time.time()
+                return current_sandbox
+
+            logger.warning(f"Sandbox {sandbox_id} container is not alive, evicting from cache for auto-restart")
+            self._sandboxes.pop(sandbox_id, None)
+            self._sandbox_infos.pop(sandbox_id, None)
+            self._last_activity.pop(sandbox_id, None)
+            self._warm_pool.pop(sandbox_id, None)
+            thread_ids = [tid for tid, sid in self._thread_sandboxes.items() if sid == sandbox_id]
+            for tid in thread_ids:
+                del self._thread_sandboxes[tid]
+            info_to_destroy = info
+
+        if info_to_destroy:
+            try:
+                self._backend.destroy(info_to_destroy)
+            except Exception as e:
+                logger.warning(f"Failed to cleanup dead sandbox {sandbox_id}: {e}")
+        return None
+
     def release(self, sandbox_id: str) -> None:
         """Release a sandbox from active use into the warm pool.
 

backend/packages/harness/deerflow/community/aio_sandbox/backend.py

@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-import asyncio
 import logging
 import time
 from abc import ABC, abstractmethod
 
-import httpx
 import requests
 
 from .sandbox_info import SandboxInfo
@@ -37,34 +35,6 @@ def wait_for_sandbox_ready(sandbox_url: str, timeout: int = 30) -> bool:
     return False
 
 
-async def wait_for_sandbox_ready_async(sandbox_url: str, timeout: int = 30, poll_interval: float = 1.0) -> bool:
-    """Async variant of sandbox readiness polling.
-
-    Use this from async runtime paths so sandbox startup waits do not block the
-    event loop. The synchronous ``wait_for_sandbox_ready`` function remains for
-    existing synchronous backend/provider call sites.
-    """
-    loop = asyncio.get_running_loop()
-    deadline = loop.time() + timeout
-
-    async with httpx.AsyncClient(timeout=5) as client:
-        while True:
-            remaining = deadline - loop.time()
-            if remaining <= 0:
-                break
-            try:
-                response = await client.get(f"{sandbox_url}/v1/sandbox", timeout=min(5.0, remaining))
-                if response.status_code == 200:
-                    return True
-            except httpx.RequestError:
-                pass
-            remaining = deadline - loop.time()
-            if remaining <= 0:
-                break
-            await asyncio.sleep(min(poll_interval, remaining))
-    return False
-
-
 class SandboxBackend(ABC):
     """Abstract base for sandbox provisioning backends.
 
@@ -74,7 +44,7 @@ class SandboxBackend(ABC):
     """
 
     @abstractmethod
-    def create(self, thread_id: str | None, sandbox_id: str, extra_mounts: list[tuple[str, str, bool]] | None = None) -> SandboxInfo:
+    def create(self, thread_id: str, sandbox_id: str, extra_mounts: list[tuple[str, str, bool]] | None = None) -> SandboxInfo:
         """Create/provision a new sandbox.
 
         Args:

backend/packages/harness/deerflow/community/aio_sandbox/local_backend.py

@@ -241,7 +241,7 @@ class LocalContainerBackend(SandboxBackend):
 
     # ── SandboxBackend interface ──────────────────────────────────────────
 
-    def create(self, thread_id: str | None, sandbox_id: str, extra_mounts: list[tuple[str, str, bool]] | None = None) -> SandboxInfo:
+    def create(self, thread_id: str, sandbox_id: str, extra_mounts: list[tuple[str, str, bool]] | None = None) -> SandboxInfo:
         """Start a new container and return its connection info.
 
         Args:

backend/packages/harness/deerflow/community/aio_sandbox/remote_backend.py

@@ -21,8 +21,6 @@ import logging
 
 import requests
 
-from deerflow.runtime.user_context import get_effective_user_id
-
 from .backend import SandboxBackend
 from .sandbox_info import SandboxInfo
 
@@ -59,7 +57,7 @@ class RemoteSandboxBackend(SandboxBackend):
 
     def create(
         self,
-        thread_id: str | None,
+        thread_id: str,
         sandbox_id: str,
         extra_mounts: list[tuple[str, str, bool]] | None = None,
     ) -> SandboxInfo:
@@ -132,7 +130,7 @@ class RemoteSandboxBackend(SandboxBackend):
             logger.warning("Provisioner list_running failed: %s", exc)
             return []
 
-    def _provisioner_create(self, thread_id: str | None, sandbox_id: str, extra_mounts: list[tuple[str, str, bool]] | None = None) -> SandboxInfo:
+    def _provisioner_create(self, thread_id: str, sandbox_id: str, extra_mounts: list[tuple[str, str, bool]] | None = None) -> SandboxInfo:
         """POST /api/sandboxes → create Pod + Service."""
         try:
             resp = requests.post(
@@ -140,7 +138,6 @@ class RemoteSandboxBackend(SandboxBackend):
                 json={
                     "sandbox_id": sandbox_id,
                     "thread_id": thread_id,
-                    "user_id": get_effective_user_id(),
                 },
                 timeout=30,
             )

backend/packages/harness/deerflow/config/extensions_config.py

@@ -141,7 +141,7 @@ class ExtensionsConfig(BaseModel):
         try:
             with open(resolved_path, encoding="utf-8") as f:
                 config_data = json.load(f)
-            config_data = cls.resolve_env_variables(config_data)
+            cls.resolve_env_variables(config_data)
             return cls.model_validate(config_data)
         except json.JSONDecodeError as e:
             raise ValueError(f"Extensions config file at {resolved_path} is not valid JSON: {e}") from e
@@ -149,7 +149,7 @@ class ExtensionsConfig(BaseModel):
             raise RuntimeError(f"Failed to load extensions config from {resolved_path}: {e}") from e
 
     @classmethod
-    def resolve_env_variables(cls, config: Any) -> Any:
+    def resolve_env_variables(cls, config: dict[str, Any]) -> dict[str, Any]:
         """Recursively resolve environment variables in the config.
 
         Environment variables are resolved using the `os.getenv` function. Example: $OPENAI_API_KEY
@@ -160,26 +160,23 @@ class ExtensionsConfig(BaseModel):
         Returns:
             The config with environment variables resolved.
         """
-        if isinstance(config, str):
+        for key, value in config.items():
-            if not config.startswith("$"):
+            if isinstance(value, str):
-                return config
+                if value.startswith("$"):
-            env_value = os.getenv(config[1:])
+                    env_value = os.getenv(value[1:])
                     if env_value is None:
                         # Unresolved placeholder — store empty string so downstream
                         # consumers (e.g. MCP servers) don't receive the literal "$VAR"
                         # token as an actual environment value.
-                return ""
+                        config[key] = ""
-            return env_value
+                    else:
-
+                        config[key] = env_value
-        if isinstance(config, dict):
+                else:
-            return {key: cls.resolve_env_variables(value) for key, value in config.items()}
+                    config[key] = value
-
+            elif isinstance(value, dict):
-        if isinstance(config, list):
+                config[key] = cls.resolve_env_variables(value)
-            return [cls.resolve_env_variables(item) for item in config]
+            elif isinstance(value, list):
-
+                config[key] = [cls.resolve_env_variables(item) if isinstance(item, dict) else item for item in value]
-        if isinstance(config, tuple):
-            return tuple(cls.resolve_env_variables(item) for item in config)
-
         return config
 
     def get_enabled_mcp_servers(self) -> dict[str, McpServerConfig]:

backend/packages/harness/deerflow/config/sandbox_config.py

@@ -23,6 +23,9 @@ class SandboxConfig(BaseModel):
         replicas: Maximum number of concurrent sandbox containers (default: 3). When the limit is reached the least-recently-used sandbox is evicted to make room.
         container_prefix: Prefix for container names (default: deer-flow-sandbox)
         idle_timeout: Idle timeout in seconds before sandbox is released (default: 600 = 10 minutes). Set to 0 to disable.
+        auto_restart: Automatically restart sandbox containers that have crashed (default: true). When a tool call
+            detects the container is no longer alive, the sandbox is evicted from cache and transparently recreated
+            on the next acquire. Set to false to disable.
         mounts: List of volume mounts to share directories with the container
         environment: Environment variables to inject into the container (values starting with $ are resolved from host env)
     """
@@ -55,6 +58,10 @@ class SandboxConfig(BaseModel):
         default=None,
         description="Idle timeout in seconds before sandbox is released (default: 600 = 10 minutes). Set to 0 to disable.",
     )
+    auto_restart: bool = Field(
+        default=True,
+        description="Automatically restart sandbox containers that have crashed. When a tool call detects the container is no longer alive, the sandbox is evicted from cache and transparently recreated on the next acquire.",
+    )
     mounts: list[VolumeMountConfig] = Field(
         default_factory=list,
         description="List of volume mounts to share directories between host and container",

backend/packages/harness/deerflow/config/title_config.py

@@ -51,16 +51,3 @@ def load_title_config_from_dict(config_dict: dict) -> None:
     """Load title configuration from a dictionary."""
     global _title_config
     _title_config = TitleConfig(**config_dict)
-
-
-def reset_title_config() -> None:
-    """Restore the title configuration to its pristine ``TitleConfig()`` default.
-
-    Public API so that tests do not have to reach into the private
-    ``_title_config`` module attribute. ``AppConfig.from_file()`` calls
-    :func:`load_title_config_from_dict`, which permanently mutates the
-    singleton; tests that need a clean slate between cases should call
-    this between tests.
-    """
-    global _title_config
-    _title_config = TitleConfig()

backend/packages/harness/deerflow/config/tracing_config.py

@@ -147,15 +147,3 @@ def validate_enabled_tracing_providers() -> None:
 def is_tracing_enabled() -> bool:
     """Check if any tracing provider is enabled and fully configured."""
     return get_tracing_config().is_configured
-
-
-def reset_tracing_config() -> None:
-    """Discard the cached :class:`TracingConfig` so the next call rebuilds it.
-
-    Public API so that tests do not have to reach into the private
-    ``_tracing_config`` module attribute. A future internal rename would
-    silently break callers that mutate the attribute directly.
-    """
-    global _tracing_config
-    with _config_lock:
-        _tracing_config = None

backend/packages/harness/deerflow/mcp/cache.py

@@ -134,25 +134,9 @@ def reset_mcp_tools_cache() -> None:
     """Reset the MCP tools cache.
 
     This is useful for testing or when you want to reload MCP tools.
-    Also closes all persistent MCP sessions so they are recreated on
-    the next tool load.
     """
     global _mcp_tools_cache, _cache_initialized, _config_mtime
     _mcp_tools_cache = None
     _cache_initialized = False
     _config_mtime = None
-
-    # Close persistent sessions – they will be recreated by the next
-    # get_mcp_tools() call with the (possibly updated) connection config.
-    try:
-        from deerflow.mcp.session_pool import get_session_pool
-
-        pool = get_session_pool()
-        pool.close_all_sync()
-    except Exception:
-        logger.debug("Could not close MCP session pool on cache reset", exc_info=True)
-
-    from deerflow.mcp.session_pool import reset_session_pool
-
-    reset_session_pool()
     logger.info("MCP tools cache reset")

backend/packages/harness/deerflow/mcp/session_pool.py

@@ -1,198 +0,0 @@
-"""Persistent MCP session pool for stateful tool calls.
-
-When MCP tools are loaded via langchain-mcp-adapters with ``session=None``,
-each tool call creates a new MCP session. For stateful servers like Playwright,
-this means browser state (opened pages, filled forms) is lost between calls.
-
-This module provides a session pool that maintains persistent MCP sessions,
-scoped by ``(server_name, scope_key)`` — typically scope_key is the thread_id —
-so that consecutive tool calls share the same session and server-side state.
-Sessions are evicted in LRU order when the pool reaches capacity.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import logging
-import threading
-from collections import OrderedDict
-from typing import Any
-
-from mcp import ClientSession
-
-logger = logging.getLogger(__name__)
-
-
-class MCPSessionPool:
-    """Manages persistent MCP sessions scoped by ``(server_name, scope_key)``."""
-
-    MAX_SESSIONS = 256
-    SESSION_CLOSE_TIMEOUT = 5.0  # seconds to wait when closing a session via run_coroutine_threadsafe
-
-    def __init__(self) -> None:
-        self._entries: OrderedDict[
-            tuple[str, str],
-            tuple[ClientSession, asyncio.AbstractEventLoop],
-        ] = OrderedDict()
-        self._context_managers: dict[tuple[str, str], Any] = {}
-        # threading.Lock is not bound to any event loop, so it is safe to
-        # acquire from both async paths and sync/worker-thread paths.
-        self._lock = threading.Lock()
-
-    async def get_session(
-        self,
-        server_name: str,
-        scope_key: str,
-        connection: dict[str, Any],
-    ) -> ClientSession:
-        """Get or create a persistent MCP session.
-
-        If an existing session was created in a different event loop (e.g.
-        the sync-wrapper path), it is closed and replaced with a fresh one
-        in the current loop.
-
-        Args:
-            server_name: MCP server name.
-            scope_key: Isolation key (typically thread_id).
-            connection: Connection configuration for ``create_session``.
-
-        Returns:
-            An initialized ``ClientSession``.
-        """
-        key = (server_name, scope_key)
-        current_loop = asyncio.get_running_loop()
-
-        # Phase 1: inspect/mutate the registry under the thread lock (no awaits).
-        cms_to_close: list[tuple[tuple[str, str], Any]] = []
-        with self._lock:
-            if key in self._entries:
-                session, loop = self._entries[key]
-                if loop is current_loop:
-                    self._entries.move_to_end(key)
-                    return session
-                # Session belongs to a different event loop – evict it.
-                cm = self._context_managers.pop(key, None)
-                self._entries.pop(key)
-                if cm is not None:
-                    cms_to_close.append((key, cm))
-
-            # Evict LRU entries when at capacity.
-            while len(self._entries) >= self.MAX_SESSIONS:
-                oldest_key = next(iter(self._entries))
-                cm = self._context_managers.pop(oldest_key, None)
-                self._entries.pop(oldest_key)
-                if cm is not None:
-                    cms_to_close.append((oldest_key, cm))
-
-        # Phase 2: async cleanup outside the lock so we never await while holding it.
-        for close_key, cm in cms_to_close:
-            try:
-                await cm.__aexit__(None, None, None)
-            except Exception:
-                logger.warning("Error closing MCP session %s", close_key, exc_info=True)
-
-        from langchain_mcp_adapters.sessions import create_session
-
-        cm = create_session(connection)
-        session = await cm.__aenter__()
-        await session.initialize()
-
-        # Phase 3: register the new session under the lock.
-        with self._lock:
-            self._entries[key] = (session, current_loop)
-            self._context_managers[key] = cm
-        logger.info("Created persistent MCP session for %s/%s", server_name, scope_key)
-        return session
-
-    # ------------------------------------------------------------------
-    # Cleanup helpers
-    # ------------------------------------------------------------------
-
-    async def _close_cm(self, key: tuple[str, str], cm: Any) -> None:
-        """Close a single context manager (must be called WITHOUT the lock)."""
-        try:
-            await cm.__aexit__(None, None, None)
-        except Exception:
-            logger.warning("Error closing MCP session %s", key, exc_info=True)
-
-    async def close_scope(self, scope_key: str) -> None:
-        """Close all sessions for a given scope (e.g. thread_id)."""
-        with self._lock:
-            keys = [k for k in self._entries if k[1] == scope_key]
-            cms = [(k, self._context_managers.pop(k, None)) for k in keys]
-            for k in keys:
-                self._entries.pop(k, None)
-        for key, cm in cms:
-            if cm is not None:
-                await self._close_cm(key, cm)
-
-    async def close_server(self, server_name: str) -> None:
-        """Close all sessions for a given server."""
-        with self._lock:
-            keys = [k for k in self._entries if k[0] == server_name]
-            cms = [(k, self._context_managers.pop(k, None)) for k in keys]
-            for k in keys:
-                self._entries.pop(k, None)
-        for key, cm in cms:
-            if cm is not None:
-                await self._close_cm(key, cm)
-
-    async def close_all(self) -> None:
-        """Close every managed session."""
-        with self._lock:
-            cms = list(self._context_managers.items())
-            self._context_managers.clear()
-            self._entries.clear()
-        for key, cm in cms:
-            await self._close_cm(key, cm)
-
-    def close_all_sync(self) -> None:
-        """Close all sessions using their owning event loops (synchronous).
-
-        Each session is closed on the loop it was created in, avoiding
-        cross-loop resource leaks.  Safe to call from any thread without an
-        active event loop.
-        """
-        with self._lock:
-            entries = list(self._entries.items())
-            cms = dict(self._context_managers)
-            self._entries.clear()
-            self._context_managers.clear()
-
-        for key, (_, loop) in entries:
-            cm = cms.get(key)
-            if cm is None or loop.is_closed():
-                continue
-            try:
-                if loop.is_running():
-                    # Schedule on the owning loop from this (different) thread.
-                    future = asyncio.run_coroutine_threadsafe(cm.__aexit__(None, None, None), loop)
-                    future.result(timeout=self.SESSION_CLOSE_TIMEOUT)
-                else:
-                    loop.run_until_complete(cm.__aexit__(None, None, None))
-            except Exception:
-                logger.debug("Error closing MCP session %s during sync close", key, exc_info=True)
-
-
-# ------------------------------------------------------------------
-# Module-level singleton
-# ------------------------------------------------------------------
-
-_pool: MCPSessionPool | None = None
-_pool_lock = threading.Lock()
-
-
-def get_session_pool() -> MCPSessionPool:
-    """Return the global session-pool singleton."""
-    global _pool
-    if _pool is None:
-        with _pool_lock:
-            if _pool is None:
-                _pool = MCPSessionPool()
-    return _pool
-
-
-def reset_session_pool() -> None:
-    """Reset the singleton (for tests)."""
-    global _pool
-    _pool = None

backend/packages/harness/deerflow/mcp/tools.py

@@ -1,181 +1,62 @@
-"""Load MCP tools using langchain-mcp-adapters with persistent sessions."""
+"""Load MCP tools using langchain-mcp-adapters."""
-
-from __future__ import annotations
 
+import asyncio
+import atexit
+import concurrent.futures
 import logging
+from collections.abc import Callable
 from typing import Any
 
-from langchain_core.tools import BaseTool, StructuredTool
+from langchain_core.tools import BaseTool
-from langgraph.config import get_config
 
 from deerflow.config.extensions_config import ExtensionsConfig
 from deerflow.mcp.client import build_servers_config
 from deerflow.mcp.oauth import build_oauth_tool_interceptor, get_initial_oauth_headers
-from deerflow.mcp.session_pool import get_session_pool
 from deerflow.reflection import resolve_variable
-from deerflow.tools.sync import make_sync_tool_wrapper
-from deerflow.tools.types import Runtime
 
 logger = logging.getLogger(__name__)
 
+# Global thread pool for sync tool invocation in async environments
+_SYNC_TOOL_EXECUTOR = concurrent.futures.ThreadPoolExecutor(max_workers=10, thread_name_prefix="mcp-sync-tool")
 
-def _extract_thread_id(runtime: Runtime | None) -> str:
+# Register shutdown hook for the global executor
-    """Extract thread_id from the injected tool runtime or LangGraph config."""
+atexit.register(lambda: _SYNC_TOOL_EXECUTOR.shutdown(wait=False))
-    if runtime is not None:
-        tid = runtime.context.get("thread_id") if runtime.context else None
-        if tid is not None:
-            return str(tid)
-        config = runtime.config or {}
-        tid = config.get("configurable", {}).get("thread_id")
-        if tid is not None:
-            return str(tid)
 
+
+def _make_sync_tool_wrapper(coro: Callable[..., Any], tool_name: str) -> Callable[..., Any]:
+    """Build a synchronous wrapper for an asynchronous tool coroutine.
+
+    Args:
+        coro: The tool's asynchronous coroutine.
+        tool_name: Name of the tool (for logging).
+
+    Returns:
+        A synchronous function that correctly handles nested event loops.
+    """
+
+    def sync_wrapper(*args: Any, **kwargs: Any) -> Any:
         try:
-        tid = get_config().get("configurable", {}).get("thread_id")
+            loop = asyncio.get_running_loop()
-        return str(tid) if tid is not None else "default"
         except RuntimeError:
-        return "default"
+            loop = None
 
-
-def _convert_call_tool_result(call_tool_result: Any) -> Any:
-    """Convert an MCP CallToolResult to the LangChain ``content_and_artifact`` format.
-
-    Implements the same conversion logic as the adapter without relying on
-    the private ``langchain_mcp_adapters.tools._convert_call_tool_result`` symbol.
-    """
-    from langchain_core.messages import ToolMessage
-    from langchain_core.messages.content import create_file_block, create_image_block, create_text_block
-    from langchain_core.tools import ToolException
-    from mcp.types import EmbeddedResource, ImageContent, ResourceLink, TextContent, TextResourceContents
-
-    # Pass ToolMessage through directly (interceptor short-circuit).
-    if isinstance(call_tool_result, ToolMessage):
-        return call_tool_result, None
-
-    # Pass LangGraph Command through directly when langgraph is installed.
         try:
-        from langgraph.types import Command
+            if loop is not None and loop.is_running():
-
+                # Use global executor to avoid nested loop issues and improve performance
-        if isinstance(call_tool_result, Command):
+                future = _SYNC_TOOL_EXECUTOR.submit(asyncio.run, coro(*args, **kwargs))
-            return call_tool_result, None
+                return future.result()
-    except ImportError:
-        # langgraph is optional; if unavailable, continue with standard MCP content conversion.
-        pass
-
-    # Convert MCP content blocks to LangChain content blocks.
-    lc_content = []
-    for item in call_tool_result.content:
-        if isinstance(item, TextContent):
-            lc_content.append(create_text_block(text=item.text))
-        elif isinstance(item, ImageContent):
-            lc_content.append(create_image_block(base64=item.data, mime_type=item.mimeType))
-        elif isinstance(item, ResourceLink):
-            mime = item.mimeType or None
-            if mime and mime.startswith("image/"):
-                lc_content.append(create_image_block(url=str(item.uri), mime_type=mime))
             else:
-                lc_content.append(create_file_block(url=str(item.uri), mime_type=mime))
+                return asyncio.run(coro(*args, **kwargs))
-        elif isinstance(item, EmbeddedResource):
+        except Exception as e:
-            from mcp.types import BlobResourceContents
+            logger.error(f"Error invoking MCP tool '{tool_name}' via sync wrapper: {e}", exc_info=True)
+            raise
 
-            res = item.resource
+    return sync_wrapper
-            if isinstance(res, TextResourceContents):
-                lc_content.append(create_text_block(text=res.text))
-            elif isinstance(res, BlobResourceContents):
-                mime = res.mimeType or None
-                if mime and mime.startswith("image/"):
-                    lc_content.append(create_image_block(base64=res.blob, mime_type=mime))
-                else:
-                    lc_content.append(create_file_block(base64=res.blob, mime_type=mime))
-            else:
-                lc_content.append(create_text_block(text=str(res)))
-        else:
-            lc_content.append(create_text_block(text=str(item)))
-
-    if call_tool_result.isError:
-        error_parts = [item["text"] for item in lc_content if isinstance(item, dict) and item.get("type") == "text"]
-        raise ToolException("\n".join(error_parts) if error_parts else str(lc_content))
-
-    artifact = None
-    if call_tool_result.structuredContent is not None:
-        artifact = {"structured_content": call_tool_result.structuredContent}
-
-    return lc_content, artifact
-
-
-def _make_session_pool_tool(
-    tool: BaseTool,
-    server_name: str,
-    connection: dict[str, Any],
-    tool_interceptors: list[Any] | None = None,
-) -> BaseTool:
-    """Wrap an MCP tool so it reuses a persistent session from the pool.
-
-    Replaces the per-call session creation with pool-managed sessions scoped
-    by ``(server_name, thread_id)``.  This ensures stateful MCP servers (e.g.
-    Playwright) keep their state across tool calls within the same thread.
-
-    The configured ``tool_interceptors`` (OAuth, custom) are preserved and
-    applied on every call before invoking the pooled session.
-    """
-    # Strip the server-name prefix to recover the original MCP tool name.
-    original_name = tool.name
-    prefix = f"{server_name}_"
-    if original_name.startswith(prefix):
-        original_name = original_name[len(prefix) :]
-
-    pool = get_session_pool()
-
-    async def call_with_persistent_session(
-        runtime: Runtime | None = None,
-        **arguments: Any,
-    ) -> Any:
-        thread_id = _extract_thread_id(runtime)
-        session = await pool.get_session(server_name, thread_id, connection)
-
-        if tool_interceptors:
-            from langchain_mcp_adapters.interceptors import MCPToolCallRequest
-
-            async def base_handler(request: MCPToolCallRequest) -> Any:
-                return await session.call_tool(request.name, request.args)
-
-            handler = base_handler
-            for interceptor in reversed(tool_interceptors):
-                outer = handler
-
-                async def wrapped(req: Any, _i: Any = interceptor, _h: Any = outer) -> Any:
-                    return await _i(req, _h)
-
-                handler = wrapped
-
-            request = MCPToolCallRequest(
-                name=original_name,
-                args=arguments,
-                server_name=server_name,
-                runtime=runtime,
-            )
-            call_tool_result = await handler(request)
-        else:
-            call_tool_result = await session.call_tool(original_name, arguments)
-
-        return _convert_call_tool_result(call_tool_result)
-
-    return StructuredTool(
-        name=tool.name,
-        description=tool.description,
-        args_schema=tool.args_schema,
-        coroutine=call_with_persistent_session,
-        response_format="content_and_artifact",
-        metadata=tool.metadata,
-    )
 
 
 async def get_mcp_tools() -> list[BaseTool]:
     """Get all tools from enabled MCP servers.
 
-    Tools are wrapped with persistent-session logic so that consecutive
-    calls within the same thread reuse the same MCP session.
-
     Returns:
         List of LangChain tools from all enabled MCP servers.
     """
@@ -210,7 +91,7 @@ async def get_mcp_tools() -> list[BaseTool]:
                 existing_headers["Authorization"] = auth_header
                 servers_config[server_name]["headers"] = existing_headers
 
-        tool_interceptors: list[Any] = []
+        tool_interceptors = []
         oauth_interceptor = build_oauth_tool_interceptor(extensions_config)
         if oauth_interceptor is not None:
             tool_interceptors.append(oauth_interceptor)
@@ -234,42 +115,20 @@ async def get_mcp_tools() -> list[BaseTool]:
                 elif interceptor is not None:
                     logger.warning(f"Builder {interceptor_path} returned non-callable {type(interceptor).__name__}; skipping")
             except Exception as e:
-                logger.warning(
+                logger.warning(f"Failed to load MCP interceptor {interceptor_path}: {e}", exc_info=True)
-                    f"Failed to load MCP interceptor {interceptor_path}: {e}",
-                    exc_info=True,
-                )
 
-        client = MultiServerMCPClient(
+        client = MultiServerMCPClient(servers_config, tool_interceptors=tool_interceptors, tool_name_prefix=True)
-            servers_config,
-            tool_interceptors=tool_interceptors,
-            tool_name_prefix=True,
-        )
 
-        # Get all tools from all servers (discovers tool definitions via
+        # Get all tools from all servers
-        # temporary sessions – the persistent-session wrapping is applied below).
         tools = await client.get_tools()
         logger.info(f"Successfully loaded {len(tools)} tool(s) from MCP servers")
 
-        # Wrap each tool with persistent-session logic.
-        wrapped_tools: list[BaseTool] = []
-        for tool in tools:
-            tool_server: str | None = None
-            for name in servers_config:
-                if tool.name.startswith(f"{name}_"):
-                    tool_server = name
-                    break
-
-            if tool_server is not None:
-                wrapped_tools.append(_make_session_pool_tool(tool, tool_server, servers_config[tool_server], tool_interceptors))
-            else:
-                wrapped_tools.append(tool)
-
         # Patch tools to support sync invocation, as deerflow client streams synchronously
-        for tool in wrapped_tools:
+        for tool in tools:
             if getattr(tool, "func", None) is None and getattr(tool, "coroutine", None) is not None:
-                tool.func = make_sync_tool_wrapper(tool.coroutine, tool.name)
+                tool.func = _make_sync_tool_wrapper(tool.coroutine, tool.name)
 
-        return wrapped_tools
+        return tools
 
     except Exception as e:
         logger.error(f"Failed to load MCP tools: {e}", exc_info=True)

backend/packages/harness/deerflow/models/factory.py

@@ -47,24 +47,11 @@ def _enable_stream_usage_by_default(model_use_path: str, model_settings_from_con
         model_settings_from_config["stream_usage"] = True
 
 
-def create_chat_model(name: str | None = None, thinking_enabled: bool = False, *, app_config: AppConfig | None = None, attach_tracing: bool = True, **kwargs) -> BaseChatModel:
+def create_chat_model(name: str | None = None, thinking_enabled: bool = False, *, app_config: AppConfig | None = None, **kwargs) -> BaseChatModel:
     """Create a chat model instance from the config.
 
     Args:
         name: The name of the model to create. If None, the first model in the config will be used.
-        thinking_enabled: Enable the model's extended-thinking mode when supported.
-        app_config: Explicit application config; falls back to the cached global if omitted.
-        attach_tracing: When True (default), attach tracing callbacks (Langfuse,
-            LangSmith) directly to the model instance. Standalone callers — anything
-            that invokes the model outside a LangGraph run that already wires tracing
-            at the invocation root (``MemoryUpdater``, ad-hoc utilities, etc.) — keep
-            this default so the model-level callback still produces traces. Callers
-            that already attach tracing at the graph root (``make_lead_agent``, the
-            in-graph ``TitleMiddleware``) MUST pass ``attach_tracing=False``; otherwise
-            the same LLM call emits duplicate spans (one rooted at the graph, one at
-            the model) and ``session_id`` / ``user_id`` metadata never reach the trace
-            because the model becomes a nested observation whose ``langfuse_*`` keys
-            get stripped.
 
     Returns:
         A chat model instance.
@@ -162,7 +149,6 @@ def create_chat_model(name: str | None = None, thinking_enabled: bool = False, *
 
     model_instance = model_class(**kwargs, **model_settings_from_config)
 
-    if attach_tracing:
     callbacks = build_tracing_callbacks()
     if callbacks:
         existing_callbacks = model_instance.callbacks or []

backend/packages/harness/deerflow/persistence/feedback/sql.py

@@ -13,7 +13,6 @@ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 
 from deerflow.persistence.feedback.model import FeedbackRow
 from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
-from deerflow.utils.time import coerce_iso
 
 
 class FeedbackRepository:
@@ -25,8 +24,7 @@ class FeedbackRepository:
         d = row.to_dict()
         val = d.get("created_at")
         if isinstance(val, datetime):
-            # SQLite drops tzinfo on read; normalize via ``coerce_iso`` so output is always tz-aware.
+            d["created_at"] = val.isoformat()
-            d["created_at"] = coerce_iso(val)
         return d
 
     async def create(

backend/packages/harness/deerflow/persistence/json_compat.py

@@ -1,195 +0,0 @@
-"""Dialect-aware JSON value matching for SQLAlchemy (SQLite + PostgreSQL)."""
-
-from __future__ import annotations
-
-import re
-from dataclasses import dataclass
-from typing import Any
-
-from sqlalchemy import BigInteger, Float, String, bindparam
-from sqlalchemy.ext.compiler import compiles
-from sqlalchemy.sql.compiler import SQLCompiler
-from sqlalchemy.sql.expression import ColumnElement
-from sqlalchemy.sql.visitors import InternalTraversal
-from sqlalchemy.types import Boolean, TypeEngine
-
-# Key is interpolated into compiled SQL; restrict charset to prevent injection.
-_KEY_CHARSET_RE = re.compile(r"^[A-Za-z0-9_\-]+$")
-
-# Allowed value types for metadata filter values (same set accepted by JsonMatch).
-ALLOWED_FILTER_VALUE_TYPES: tuple[type, ...] = (type(None), bool, int, float, str)
-
-# SQLite raises an overflow when binding values outside signed 64-bit range;
-# PostgreSQL overflows during BIGINT cast. Reject at validation time instead.
-_INT64_MIN = -(2**63)
-_INT64_MAX = 2**63 - 1
-
-
-def validate_metadata_filter_key(key: object) -> bool:
-    """Return True if *key* is safe for use as a JSON metadata filter key.
-
-    A key is "safe" when it is a string matching ``[A-Za-z0-9_-]+``. The
-    charset is restricted because the key is interpolated into the
-    compiled SQL path expression (``$."<key>"`` / ``->`` literal), so any
-    laxer pattern would open a SQL/JSONPath injection surface.
-    """
-    return isinstance(key, str) and bool(_KEY_CHARSET_RE.match(key))
-
-
-def validate_metadata_filter_value(value: object) -> bool:
-    """Return True if *value* is an allowed type for a JSON metadata filter.
-
-    Matches the set of types ``_build_clause`` knows how to compile into
-    a dialect-portable predicate. Anything else (list/dict/bytes/...) is
-    intentionally rejected rather than silently coerced via ``str()`` —
-    silent coercion would (a) produce wrong matches and (b) break
-    SQLAlchemy's ``inherit_cache`` invariant when ``value`` is unhashable.
-
-    Integer values are additionally restricted to the signed 64-bit range
-    ``[-2**63, 2**63 - 1]``: SQLite overflows when binding larger values
-    and PostgreSQL overflows during the ``BIGINT`` cast.
-    """
-    if not isinstance(value, ALLOWED_FILTER_VALUE_TYPES):
-        return False
-    if isinstance(value, int) and not isinstance(value, bool):
-        if not (_INT64_MIN <= value <= _INT64_MAX):
-            return False
-    return True
-
-
-class JsonMatch(ColumnElement):
-    """Dialect-portable ``column[key] == value`` for JSON columns.
-
-    Compiles to ``json_type``/``json_extract`` on SQLite and
-    ``json_typeof``/``->>`` on PostgreSQL, with type-safe comparison
-    that distinguishes bool vs int and NULL vs missing key.
-
-    *key* must be a single literal key matching ``[A-Za-z0-9_-]+``.
-    *value* must be one of: ``None``, ``bool``, ``int`` (signed 64-bit), ``float``, ``str``.
-    """
-
-    inherit_cache = True
-    type = Boolean()
-    _is_implicitly_boolean = True
-
-    _traverse_internals = [
-        ("column", InternalTraversal.dp_clauseelement),
-        ("key", InternalTraversal.dp_string),
-        ("value", InternalTraversal.dp_plain_obj),
-    ]
-
-    def __init__(self, column: ColumnElement, key: str, value: object) -> None:
-        if not validate_metadata_filter_key(key):
-            raise ValueError(f"JsonMatch key must match {_KEY_CHARSET_RE.pattern!r}; got: {key!r}")
-        if not validate_metadata_filter_value(value):
-            if isinstance(value, int) and not isinstance(value, bool):
-                raise TypeError(f"JsonMatch int value out of signed 64-bit range [-2**63, 2**63-1]: {value!r}")
-            raise TypeError(f"JsonMatch value must be None, bool, int, float, or str; got: {type(value).__name__!r}")
-        self.column = column
-        self.key = key
-        self.value = value
-        super().__init__()
-
-
-@dataclass(frozen=True)
-class _Dialect:
-    """Per-dialect names used when emitting JSON type/value comparisons."""
-
-    null_type: str
-    num_types: tuple[str, ...]
-    num_cast: str
-    int_types: tuple[str, ...]
-    int_cast: str
-    # None for SQLite where json_type already returns 'integer'/'real';
-    # regex literal for PostgreSQL where json_typeof returns 'number' for
-    # both ints and floats, so an extra guard prevents CAST errors on floats.
-    int_guard: str | None
-    string_type: str
-    bool_type: str | None
-
-
-_SQLITE = _Dialect(
-    null_type="null",
-    num_types=("integer", "real"),
-    num_cast="REAL",
-    int_types=("integer",),
-    int_cast="INTEGER",
-    int_guard=None,
-    string_type="text",
-    bool_type=None,
-)
-
-_PG = _Dialect(
-    null_type="null",
-    num_types=("number",),
-    num_cast="DOUBLE PRECISION",
-    int_types=("number",),
-    int_cast="BIGINT",
-    int_guard="'^-?[0-9]+$'",
-    string_type="string",
-    bool_type="boolean",
-)
-
-
-def _bind(compiler: SQLCompiler, value: object, sa_type: TypeEngine[Any], **kw: Any) -> str:
-    param = bindparam(None, value, type_=sa_type)
-    return compiler.process(param, **kw)
-
-
-def _type_check(typeof: str, types: tuple[str, ...]) -> str:
-    if len(types) == 1:
-        return f"{typeof} = '{types[0]}'"
-    quoted = ", ".join(f"'{t}'" for t in types)
-    return f"{typeof} IN ({quoted})"
-
-
-def _build_clause(compiler: SQLCompiler, typeof: str, extract: str, value: object, dialect: _Dialect, **kw: Any) -> str:
-    if value is None:
-        return f"{typeof} = '{dialect.null_type}'"
-    if isinstance(value, bool):
-        # bool check must precede int check — bool is a subclass of int in Python
-        bool_str = "true" if value else "false"
-        if dialect.bool_type is None:
-            return f"{typeof} = '{bool_str}'"
-        return f"({typeof} = '{dialect.bool_type}' AND {extract} = '{bool_str}')"
-    if isinstance(value, int):
-        bp = _bind(compiler, value, BigInteger(), **kw)
-        if dialect.int_guard:
-            # CASE prevents CAST error when json_typeof = 'number' also matches floats
-            return f"(CASE WHEN {_type_check(typeof, dialect.int_types)} AND {extract} ~ {dialect.int_guard} THEN CAST({extract} AS {dialect.int_cast}) END = {bp})"
-        return f"({_type_check(typeof, dialect.int_types)} AND CAST({extract} AS {dialect.int_cast}) = {bp})"
-    if isinstance(value, float):
-        bp = _bind(compiler, value, Float(), **kw)
-        return f"({_type_check(typeof, dialect.num_types)} AND CAST({extract} AS {dialect.num_cast}) = {bp})"
-    bp = _bind(compiler, str(value), String(), **kw)
-    return f"({typeof} = '{dialect.string_type}' AND {extract} = {bp})"
-
-
-@compiles(JsonMatch, "sqlite")
-def _compile_sqlite(element: JsonMatch, compiler: SQLCompiler, **kw: Any) -> str:
-    if not validate_metadata_filter_key(element.key):
-        raise ValueError(f"Key escaped validation: {element.key!r}")
-    col = compiler.process(element.column, **kw)
-    path = f'$."{element.key}"'
-    typeof = f"json_type({col}, '{path}')"
-    extract = f"json_extract({col}, '{path}')"
-    return _build_clause(compiler, typeof, extract, element.value, _SQLITE, **kw)
-
-
-@compiles(JsonMatch, "postgresql")
-def _compile_pg(element: JsonMatch, compiler: SQLCompiler, **kw: Any) -> str:
-    if not validate_metadata_filter_key(element.key):
-        raise ValueError(f"Key escaped validation: {element.key!r}")
-    col = compiler.process(element.column, **kw)
-    typeof = f"json_typeof({col} -> '{element.key}')"
-    extract = f"({col} ->> '{element.key}')"
-    return _build_clause(compiler, typeof, extract, element.value, _PG, **kw)
-
-
-@compiles(JsonMatch)
-def _compile_default(element: JsonMatch, compiler: SQLCompiler, **kw: Any) -> str:
-    raise NotImplementedError(f"JsonMatch supports only sqlite and postgresql; got dialect: {compiler.dialect.name}")
-
-
-def json_match(column: ColumnElement, key: str, value: object) -> JsonMatch:
-    return JsonMatch(column, key, value)

backend/packages/harness/deerflow/persistence/run/sql.py

@@ -17,25 +17,12 @@ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 from deerflow.persistence.run.model import RunRow
 from deerflow.runtime.runs.store.base import RunStore
 from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
-from deerflow.utils.time import coerce_iso
 
 
 class RunRepository(RunStore):
     def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
         self._sf = session_factory
 
-    @staticmethod
-    def _normalize_model_name(model_name: str | None) -> str | None:
-        """Normalize model_name for storage: strip whitespace, truncate to 128 chars."""
-        if model_name is None:
-            return None
-        if not isinstance(model_name, str):
-            model_name = str(model_name)
-        normalized = model_name.strip()
-        if len(normalized) > 128:
-            normalized = normalized[:128]
-        return normalized
-
     @staticmethod
     def _safe_json(obj: Any) -> Any:
         """Ensure obj is JSON-serializable. Falls back to model_dump() or str()."""
@@ -69,13 +56,11 @@ class RunRepository(RunStore):
         # Remap JSON columns to match RunStore interface
         d["metadata"] = d.pop("metadata_json", {})
         d["kwargs"] = d.pop("kwargs_json", {})
-        # Convert datetime to ISO string for consistency with MemoryRunStore.
+        # Convert datetime to ISO string for consistency with MemoryRunStore
-        # SQLite drops tzinfo on read despite ``DateTime(timezone=True)`` —
-        # ``coerce_iso`` normalizes naive datetimes as UTC.
         for key in ("created_at", "updated_at"):
             val = d.get(key)
             if isinstance(val, datetime):
-                d[key] = coerce_iso(val)
+                d[key] = val.isoformat()
         return d
 
     async def put(
@@ -85,7 +70,6 @@ class RunRepository(RunStore):
         thread_id,
         assistant_id=None,
         user_id: str | None | _AutoSentinel = AUTO,
-        model_name: str | None = None,
         status="pending",
         multitask_strategy="reject",
         metadata=None,
@@ -101,7 +85,6 @@ class RunRepository(RunStore):
             thread_id=thread_id,
             assistant_id=assistant_id,
             user_id=resolved_user_id,
-            model_name=self._normalize_model_name(model_name),
             status=status,
             multitask_strategy=multitask_strategy,
             metadata_json=self._safe_json(metadata) or {},
@@ -154,11 +137,6 @@ class RunRepository(RunStore):
             await session.execute(update(RunRow).where(RunRow.run_id == run_id).values(**values))
             await session.commit()
 
-    async def update_model_name(self, run_id, model_name):
-        async with self._sf() as session:
-            await session.execute(update(RunRow).where(RunRow.run_id == run_id).values(model_name=self._normalize_model_name(model_name), updated_at=datetime.now(UTC)))
-            await session.commit()
-
     async def delete(
         self,
         run_id,
@@ -231,11 +209,10 @@ class RunRepository(RunStore):
         """Aggregate token usage via a single SQL GROUP BY query."""
         _completed = RunRow.status.in_(("success", "error"))
         _thread = RunRow.thread_id == thread_id
-        model_name = func.coalesce(RunRow.model_name, "unknown")
 
         stmt = (
             select(
-                model_name.label("model"),
+                func.coalesce(RunRow.model_name, "unknown").label("model"),
                 func.count().label("runs"),
                 func.coalesce(func.sum(RunRow.total_tokens), 0).label("total_tokens"),
                 func.coalesce(func.sum(RunRow.total_input_tokens), 0).label("total_input_tokens"),
@@ -245,7 +222,7 @@ class RunRepository(RunStore):
                 func.coalesce(func.sum(RunRow.middleware_tokens), 0).label("middleware"),
             )
             .where(_thread, _completed)
-            .group_by(model_name)
+            .group_by(func.coalesce(RunRow.model_name, "unknown"))
         )
 
         async with self._sf() as session:

backend/packages/harness/deerflow/persistence/thread_meta/__init__.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from deerflow.persistence.thread_meta.base import InvalidMetadataFilterError, ThreadMetaStore
+from deerflow.persistence.thread_meta.base import ThreadMetaStore
 from deerflow.persistence.thread_meta.memory import MemoryThreadMetaStore
 from deerflow.persistence.thread_meta.model import ThreadMetaRow
 from deerflow.persistence.thread_meta.sql import ThreadMetaRepository
@@ -14,7 +14,6 @@ if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 
 __all__ = [
-    "InvalidMetadataFilterError",
     "MemoryThreadMetaStore",
     "ThreadMetaRepository",
     "ThreadMetaRow",

backend/packages/harness/deerflow/persistence/thread_meta/base.py

@@ -15,15 +15,10 @@ three-state semantics (see :mod:`deerflow.runtime.user_context`):
 from __future__ import annotations
 
 import abc
-from typing import Any
 
 from deerflow.runtime.user_context import AUTO, _AutoSentinel
 
 
-class InvalidMetadataFilterError(ValueError):
-    """Raised when all client-supplied metadata filter keys are rejected."""
-
-
 class ThreadMetaStore(abc.ABC):
     @abc.abstractmethod
     async def create(
@@ -45,12 +40,12 @@ class ThreadMetaStore(abc.ABC):
     async def search(
         self,
         *,
-        metadata: dict[str, Any] | None = None,
+        metadata: dict | None = None,
         status: str | None = None,
         limit: int = 100,
         offset: int = 0,
         user_id: str | None | _AutoSentinel = AUTO,
-    ) -> list[dict[str, Any]]:
+    ) -> list[dict]:
         pass
 
     @abc.abstractmethod

backend/packages/harness/deerflow/persistence/thread_meta/memory.py

@@ -69,12 +69,12 @@ class MemoryThreadMetaStore(ThreadMetaStore):
     async def search(
         self,
         *,
-        metadata: dict[str, Any] | None = None,
+        metadata: dict | None = None,
         status: str | None = None,
         limit: int = 100,
         offset: int = 0,
         user_id: str | None | _AutoSentinel = AUTO,
-    ) -> list[dict[str, Any]]:
+    ) -> list[dict]:
         resolved_user_id = resolve_user_id(user_id, method_name="MemoryThreadMetaStore.search")
         filter_dict: dict[str, Any] = {}
         if metadata:

backend/packages/harness/deerflow/persistence/thread_meta/sql.py

@@ -2,20 +2,15 @@
 
 from __future__ import annotations
 
-import logging
 from datetime import UTC, datetime
 from typing import Any
 
 from sqlalchemy import select, update
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 
-from deerflow.persistence.json_compat import json_match
+from deerflow.persistence.thread_meta.base import ThreadMetaStore
-from deerflow.persistence.thread_meta.base import InvalidMetadataFilterError, ThreadMetaStore
 from deerflow.persistence.thread_meta.model import ThreadMetaRow
 from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
-from deerflow.utils.time import coerce_iso
-
-logger = logging.getLogger(__name__)
 
 
 class ThreadMetaRepository(ThreadMetaStore):
@@ -25,13 +20,11 @@ class ThreadMetaRepository(ThreadMetaStore):
     @staticmethod
     def _row_to_dict(row: ThreadMetaRow) -> dict[str, Any]:
         d = row.to_dict()
-        d["metadata"] = d.pop("metadata_json", None) or {}
+        d["metadata"] = d.pop("metadata_json", {})
         for key in ("created_at", "updated_at"):
             val = d.get(key)
             if isinstance(val, datetime):
-                # SQLite drops tzinfo despite ``DateTime(timezone=True)``;
+                d[key] = val.isoformat()
-                # ``coerce_iso`` normalizes naive values as UTC so the wire format always carries tz.
-                d[key] = coerce_iso(val)
         return d
 
     async def create(
@@ -111,39 +104,35 @@ class ThreadMetaRepository(ThreadMetaStore):
     async def search(
         self,
         *,
-        metadata: dict[str, Any] | None = None,
+        metadata: dict | None = None,
         status: str | None = None,
         limit: int = 100,
         offset: int = 0,
         user_id: str | None | _AutoSentinel = AUTO,
-    ) -> list[dict[str, Any]]:
+    ) -> list[dict]:
         """Search threads with optional metadata and status filters.
 
         Owner filter is enforced by default: caller must be in a user
         context. Pass ``user_id=None`` to bypass (migration/CLI).
         """
         resolved_user_id = resolve_user_id(user_id, method_name="ThreadMetaRepository.search")
-        stmt = select(ThreadMetaRow).order_by(ThreadMetaRow.updated_at.desc(), ThreadMetaRow.thread_id.desc())
+        stmt = select(ThreadMetaRow).order_by(ThreadMetaRow.updated_at.desc())
         if resolved_user_id is not None:
             stmt = stmt.where(ThreadMetaRow.user_id == resolved_user_id)
         if status:
             stmt = stmt.where(ThreadMetaRow.status == status)
 
         if metadata:
-            applied = 0
+            # When metadata filter is active, fetch a larger window and filter
-            for key, value in metadata.items():
+            # in Python. TODO(Phase 2): use JSON DB operators (Postgres @>,
-                try:
+            # SQLite json_extract) for server-side filtering.
-                    stmt = stmt.where(json_match(ThreadMetaRow.metadata_json, key, value))
+            stmt = stmt.limit(limit * 5 + offset)
-                    applied += 1
+            async with self._sf() as session:
-                except (ValueError, TypeError) as exc:
+                result = await session.execute(stmt)
-                    logger.warning("Skipping metadata filter key %s: %s", ascii(key), exc)
+                rows = [self._row_to_dict(r) for r in result.scalars()]
-            if applied == 0:
+            rows = [r for r in rows if all(r.get("metadata", {}).get(k) == v for k, v in metadata.items())]
-                # Comma-separated plain string (no list repr / nested
+            return rows[offset : offset + limit]
-                # quoting) so the 400 detail surfaced by the Gateway is
+        else:
-                # easy for clients to read. Sorted for determinism.
-                rejected_keys = ", ".join(sorted(str(k) for k in metadata))
-                raise InvalidMetadataFilterError(f"All metadata filter keys were rejected as unsafe: {rejected_keys}")
-
             stmt = stmt.limit(limit).offset(offset)
             async with self._sf() as session:
                 result = await session.execute(stmt)

backend/packages/harness/deerflow/runtime/events/store/db.py

@@ -11,13 +11,12 @@ import logging
 from datetime import UTC, datetime
 from typing import Any
 
-from sqlalchemy import delete, func, select, text
+from sqlalchemy import delete, func, select
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 
 from deerflow.persistence.models.run_event import RunEventRow
 from deerflow.runtime.events.store.base import RunEventStore
 from deerflow.runtime.user_context import AUTO, _AutoSentinel, get_current_user, resolve_user_id
-from deerflow.utils.time import coerce_iso
 
 logger = logging.getLogger(__name__)
 
@@ -33,9 +32,7 @@ class DbRunEventStore(RunEventStore):
         d["metadata"] = d.pop("event_metadata", {})
         val = d.get("created_at")
         if isinstance(val, datetime):
-            # SQLite drops tzinfo on read despite ``DateTime(timezone=True)``;
+            d["created_at"] = val.isoformat()
-            # ``coerce_iso`` normalizes naive datetimes as UTC.
-            d["created_at"] = coerce_iso(val)
         d.pop("id", None)
         # Restore structured content that was JSON-serialized on write.
         raw = d.get("content", "")
@@ -89,28 +86,6 @@ class DbRunEventStore(RunEventStore):
         user = get_current_user()
         return str(user.id) if user is not None else None
 
-    @staticmethod
-    async def _max_seq_for_thread(session: AsyncSession, thread_id: str) -> int | None:
-        """Return the current max seq while serializing writers per thread.
-
-        PostgreSQL rejects ``SELECT max(...) FOR UPDATE`` because aggregate
-        results are not lockable rows. As a release-safe workaround, take a
-        transaction-level advisory lock keyed by thread_id before reading the
-        aggregate. Other dialects keep the existing row-locking statement.
-        """
-        stmt = select(func.max(RunEventRow.seq)).where(RunEventRow.thread_id == thread_id)
-        bind = session.get_bind()
-        dialect_name = bind.dialect.name if bind is not None else ""
-
-        if dialect_name == "postgresql":
-            await session.execute(
-                text("SELECT pg_advisory_xact_lock(hashtext(CAST(:thread_id AS text))::bigint)"),
-                {"thread_id": thread_id},
-            )
-            return await session.scalar(stmt)
-
-        return await session.scalar(stmt.with_for_update())
-
     async def put(self, *, thread_id, run_id, event_type, category, content="", metadata=None, created_at=None):  # noqa: D401
         """Write a single event — low-frequency path only.
 
@@ -125,7 +100,10 @@ class DbRunEventStore(RunEventStore):
         user_id = self._user_id_from_context()
         async with self._sf() as session:
             async with session.begin():
-                max_seq = await self._max_seq_for_thread(session, thread_id)
+                # Use FOR UPDATE to serialize seq assignment within a thread.
+                # NOTE: with_for_update() on aggregates is a no-op on SQLite;
+                # the UNIQUE(thread_id, seq) constraint catches races there.
+                max_seq = await session.scalar(select(func.max(RunEventRow.seq)).where(RunEventRow.thread_id == thread_id).with_for_update())
                 seq = (max_seq or 0) + 1
                 row = RunEventRow(
                     thread_id=thread_id,
@@ -148,8 +126,10 @@ class DbRunEventStore(RunEventStore):
         async with self._sf() as session:
             async with session.begin():
                 # Get max seq for the thread (assume all events in batch belong to same thread).
+                # NOTE: with_for_update() on aggregates is a no-op on SQLite;
+                # the UNIQUE(thread_id, seq) constraint catches races there.
                 thread_id = events[0]["thread_id"]
-                max_seq = await self._max_seq_for_thread(session, thread_id)
+                max_seq = await session.scalar(select(func.max(RunEventRow.seq)).where(RunEventRow.thread_id == thread_id).with_for_update())
                 seq = max_seq or 0
                 rows = []
                 for e in events:

backend/packages/harness/deerflow/runtime/journal.py

@@ -20,13 +20,12 @@ from __future__ import annotations
 import asyncio
 import logging
 import time
-from collections.abc import Mapping
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING, Any, cast
 from uuid import UUID
 
 from langchain_core.callbacks import BaseCallbackHandler
-from langchain_core.messages import AIMessage, AnyMessage, BaseMessage, HumanMessage, ToolMessage
+from langchain_core.messages import AnyMessage, BaseMessage, HumanMessage, ToolMessage
 from langgraph.types import Command
 
 if TYPE_CHECKING:
@@ -64,16 +63,6 @@ class RunJournal(BaseCallbackHandler):
         self._total_tokens = 0
         self._llm_call_count = 0
 
-        # Caller-bucketed token accumulators
-        self._lead_agent_tokens = 0
-        self._subagent_tokens = 0
-        self._middleware_tokens = 0
-
-        # Dedup: LangChain may fire on_llm_end multiple times for the same run_id
-        self._counted_llm_run_ids: set[str] = set()
-        self._counted_external_source_ids: set[str] = set()
-        self._counted_message_llm_run_ids: set[str] = set()
-
         # Convenience fields
         self._last_ai_msg: str | None = None
         self._first_human_msg: str | None = None
@@ -88,50 +77,6 @@ class RunJournal(BaseCallbackHandler):
 
     # -- Lifecycle callbacks --
 
-    @staticmethod
-    def _message_text(message: BaseMessage) -> str:
-        """Extract displayable text from a message's mixed content shape."""
-        content = getattr(message, "content", None)
-        if isinstance(content, str):
-            return content
-        if isinstance(content, list):
-            parts: list[str] = []
-            for block in content:
-                if isinstance(block, str):
-                    parts.append(block)
-                elif isinstance(block, Mapping):
-                    text = block.get("text")
-                    if isinstance(text, str):
-                        parts.append(text)
-                    else:
-                        nested = block.get("content")
-                        if isinstance(nested, str):
-                            parts.append(nested)
-            return "".join(parts)
-        if isinstance(content, Mapping):
-            for key in ("text", "content"):
-                value = content.get(key)
-                if isinstance(value, str):
-                    return value
-
-        text = getattr(message, "text", None)
-        if isinstance(text, str):
-            return text
-        return ""
-
-    def _record_message_summary(self, message: BaseMessage, *, caller: str | None = None) -> None:
-        """Update run-level convenience fields for persisted run rows."""
-        self._msg_count += 1
-
-        # ``last_ai_message`` should represent the lead agent's user-facing
-        # answer. Middleware/subagent model calls and empty tool-call-only
-        # AI messages must not overwrite the last useful assistant text.
-        is_ai_message = isinstance(message, AIMessage) or getattr(message, "type", None) == "ai"
-        if is_ai_message and (caller is None or caller == "lead_agent"):
-            text = self._message_text(message).strip()
-            if text:
-                self._last_ai_msg = text[:2000]
-
     def on_chain_start(
         self,
         serialized: dict[str, Any],
@@ -210,7 +155,6 @@ class RunJournal(BaseCallbackHandler):
                             content=m.model_dump(),
                             metadata={"caller": caller},
                         )
-                        self._record_message_summary(m, caller=caller)
                         break
                 if self._first_human_msg:
                     break
@@ -269,34 +213,20 @@ class RunJournal(BaseCallbackHandler):
                     "llm_call_index": call_index,
                 },
             )
-            if rid not in self._counted_message_llm_run_ids:
-                self._record_message_summary(message, caller=caller)
 
-            # Token accumulation (dedup by langchain run_id to avoid double-counting
+            # Token accumulation
-            # when the callback fires more than once for the same response)
             if self._track_tokens:
                 input_tk = usage_dict.get("input_tokens", 0) or 0
                 output_tk = usage_dict.get("output_tokens", 0) or 0
                 total_tk = usage_dict.get("total_tokens", 0) or 0
                 if total_tk == 0:
                     total_tk = input_tk + output_tk
-                if total_tk > 0 and rid not in self._counted_llm_run_ids:
+                if total_tk > 0:
-                    self._counted_llm_run_ids.add(rid)
                     self._total_input_tokens += input_tk
                     self._total_output_tokens += output_tk
                     self._total_tokens += total_tk
                     self._llm_call_count += 1
 
-                    if caller.startswith("subagent:"):
-                        self._subagent_tokens += total_tk
-                    elif caller.startswith("middleware:"):
-                        self._middleware_tokens += total_tk
-                    else:
-                        self._lead_agent_tokens += total_tk
-
-        if messages:
-            self._counted_message_llm_run_ids.add(str(run_id))
-
     def on_llm_error(self, error: BaseException, *, run_id: UUID, **kwargs: Any) -> None:
         self._llm_start_times.pop(str(run_id), None)
         self._put(event_type="llm.error", category="trace", content=str(error))
@@ -312,14 +242,12 @@ class RunJournal(BaseCallbackHandler):
             if isinstance(output, ToolMessage):
                 msg = cast(ToolMessage, output)
                 self._put(event_type="llm.tool.result", category="message", content=msg.model_dump())
-                self._record_message_summary(msg)
             elif isinstance(output, Command):
                 cmd = cast(Command, output)
                 messages = cmd.update.get("messages", [])
                 for message in messages:
                     if isinstance(message, BaseMessage):
                         self._put(event_type="llm.tool.result", category="message", content=message.model_dump())
-                        self._record_message_summary(message)
                     else:
                         logger.warning(f"on_tool_end {run_id}: command update message is not BaseMessage: {type(message)}")
             else:
@@ -402,49 +330,6 @@ class RunJournal(BaseCallbackHandler):
 
     # -- Public methods (called by worker) --
 
-    def record_external_llm_usage_records(
-        self,
-        records: list[dict[str, int | str]],
-    ) -> None:
-        """Record token usage from external sources (e.g., subagents).
-
-        Each record should contain:
-            source_run_id: Unique identifier to prevent double-counting
-            caller: Caller tag (e.g. "subagent:general-purpose")
-            input_tokens: Input token count
-            output_tokens: Output token count
-            total_tokens: Total token count (computed from input+output if 0/missing)
-        """
-        if not self._track_tokens:
-            return
-        for record in records:
-            source_id = str(record.get("source_run_id", ""))
-            if not source_id:
-                continue
-            if source_id in self._counted_external_source_ids:
-                continue
-
-            total_tk = record.get("total_tokens", 0) or 0
-            if total_tk <= 0:
-                input_tk = record.get("input_tokens", 0) or 0
-                output_tk = record.get("output_tokens", 0) or 0
-                total_tk = input_tk + output_tk
-            if total_tk <= 0:
-                continue
-
-            self._counted_external_source_ids.add(source_id)
-            self._total_input_tokens += record.get("input_tokens", 0) or 0
-            self._total_output_tokens += record.get("output_tokens", 0) or 0
-            self._total_tokens += total_tk
-
-            caller = str(record.get("caller", ""))
-            if caller.startswith("subagent:"):
-                self._subagent_tokens += total_tk
-            elif caller.startswith("middleware:"):
-                self._middleware_tokens += total_tk
-            else:
-                self._lead_agent_tokens += total_tk
-
     def set_first_human_message(self, content: str) -> None:
         """Record the first human message for convenience fields."""
         self._first_human_msg = content[:2000] if content else None
@@ -491,9 +376,6 @@ class RunJournal(BaseCallbackHandler):
             "total_output_tokens": self._total_output_tokens,
             "total_tokens": self._total_tokens,
             "llm_call_count": self._llm_call_count,
-            "lead_agent_tokens": self._lead_agent_tokens,
-            "subagent_tokens": self._subagent_tokens,
-            "middleware_tokens": self._middleware_tokens,
             "message_count": self._msg_count,
             "last_ai_message": self._last_ai_msg,
             "first_human_message": self._first_human_msg,

backend/packages/harness/deerflow/runtime/runs/manager.py

@@ -6,7 +6,7 @@ import asyncio
 import logging
 import uuid
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 from deerflow.utils.time import now_iso as _now_iso
 
@@ -36,8 +36,6 @@ class RunRecord:
     abort_event: asyncio.Event = field(default_factory=asyncio.Event, repr=False)
     abort_action: str = "interrupt"
     error: str | None = None
-    model_name: str | None = None
-    store_only: bool = False
 
 
 class RunManager:
@@ -67,43 +65,10 @@ class RunManager:
                 metadata=record.metadata or {},
                 kwargs=record.kwargs or {},
                 created_at=record.created_at,
-                model_name=record.model_name,
             )
         except Exception:
             logger.warning("Failed to persist run %s to store", record.run_id, exc_info=True)
 
-    async def _persist_status(self, run_id: str, status: RunStatus, *, error: str | None = None) -> None:
-        """Best-effort persist a status transition to the backing store."""
-        if self._store is None:
-            return
-        try:
-            await self._store.update_status(run_id, status.value, error=error)
-        except Exception:
-            logger.warning("Failed to persist status update for run %s", run_id, exc_info=True)
-
-    @staticmethod
-    def _record_from_store(row: dict[str, Any]) -> RunRecord:
-        """Build a read-only runtime record from a serialized store row.
-
-        NULL status/on_disconnect columns (e.g. from rows written before those
-        columns were added) default to ``pending`` and ``cancel`` respectively.
-        """
-        return RunRecord(
-            run_id=row["run_id"],
-            thread_id=row["thread_id"],
-            assistant_id=row.get("assistant_id"),
-            status=RunStatus(row.get("status") or RunStatus.pending.value),
-            on_disconnect=DisconnectMode(row.get("on_disconnect") or DisconnectMode.cancel.value),
-            multitask_strategy=row.get("multitask_strategy") or "reject",
-            metadata=row.get("metadata") or {},
-            kwargs=row.get("kwargs") or {},
-            created_at=row.get("created_at") or "",
-            updated_at=row.get("updated_at") or "",
-            error=row.get("error"),
-            model_name=row.get("model_name"),
-            store_only=True,
-        )
-
     async def update_run_completion(self, run_id: str, **kwargs) -> None:
         """Persist token usage and completion data to the backing store."""
         if self._store is not None:
@@ -143,77 +108,16 @@ class RunManager:
         logger.info("Run created: run_id=%s thread_id=%s", run_id, thread_id)
         return record
 
-    async def get(self, run_id: str, *, user_id: str | None = None) -> RunRecord | None:
+    def get(self, run_id: str) -> RunRecord | None:
-        """Return a run record by ID, or ``None``.
+        """Return a run record by ID, or ``None``."""
+        return self._runs.get(run_id)
 
-        Args:
+    async def list_by_thread(self, thread_id: str) -> list[RunRecord]:
-            run_id: The run ID to look up.
+        """Return all runs for a given thread, newest first."""
-            user_id: Optional user ID for permission filtering when hydrating from store.
-        """
         async with self._lock:
-            record = self._runs.get(run_id)
+            # Dict insertion order matches creation order, so reversing it gives
-        if record is not None:
+            # us deterministic newest-first results even when timestamps tie.
-            return record
+            return [r for r in self._runs.values() if r.thread_id == thread_id]
-        if self._store is None:
-            return None
-        try:
-            row = await self._store.get(run_id, user_id=user_id)
-        except Exception:
-            logger.warning("Failed to hydrate run %s from store", run_id, exc_info=True)
-            return None
-        # Re-check after store await: a concurrent create() may have inserted the
-        # in-memory record while the store call was in flight.
-        async with self._lock:
-            record = self._runs.get(run_id)
-        if record is not None:
-            return record
-        if row is None:
-            return None
-        try:
-            return self._record_from_store(row)
-        except Exception:
-            logger.warning("Failed to map store row for run %s", run_id, exc_info=True)
-            return None
-
-    async def aget(self, run_id: str, *, user_id: str | None = None) -> RunRecord | None:
-        """Return a run record by ID, checking the persistent store as fallback.
-
-        Alias for :meth:`get` for backward compatibility.
-        """
-        return await self.get(run_id, user_id=user_id)
-
-    async def list_by_thread(self, thread_id: str, *, user_id: str | None = None, limit: int = 100) -> list[RunRecord]:
-        """Return runs for a given thread, newest first, at most ``limit`` records.
-
-        In-memory runs take precedence only when the same ``run_id`` exists in both
-        memory and the backing store. The merged result is then sorted newest-first
-        by ``created_at`` and trimmed to ``limit`` (default 100).
-
-        Args:
-            thread_id: The thread ID to filter by.
-            user_id: Optional user ID for permission filtering when hydrating from store.
-            limit: Maximum number of runs to return.
-        """
-        async with self._lock:
-            # Dict insertion order gives deterministic results when timestamps tie.
-            memory_records = [r for r in self._runs.values() if r.thread_id == thread_id]
-        if self._store is None:
-            return sorted(memory_records, key=lambda r: r.created_at, reverse=True)[:limit]
-        records_by_id = {record.run_id: record for record in memory_records}
-        store_limit = max(0, limit - len(memory_records))
-        try:
-            rows = await self._store.list_by_thread(thread_id, user_id=user_id, limit=store_limit)
-        except Exception:
-            logger.warning("Failed to hydrate runs for thread %s from store", thread_id, exc_info=True)
-            return sorted(memory_records, key=lambda r: r.created_at, reverse=True)[:limit]
-        for row in rows:
-            run_id = row.get("run_id")
-            if run_id and run_id not in records_by_id:
-                try:
-                    records_by_id[run_id] = self._record_from_store(row)
-                except Exception:
-                    logger.warning("Failed to map store row for run %s", run_id, exc_info=True)
-        return sorted(records_by_id.values(), key=lambda record: record.created_at, reverse=True)[:limit]
 
     async def set_status(self, run_id: str, status: RunStatus, *, error: str | None = None) -> None:
         """Transition a run to a new status."""
@@ -226,29 +130,12 @@ class RunManager:
             record.updated_at = _now_iso()
             if error is not None:
                 record.error = error
-        await self._persist_status(run_id, status, error=error)
+        if self._store is not None:
-        logger.info("Run %s -> %s", run_id, status.value)
-
-    async def _persist_model_name(self, run_id: str, model_name: str | None) -> None:
-        """Best-effort persist model_name update to the backing store."""
-        if self._store is None:
-            return
             try:
-            await self._store.update_model_name(run_id, model_name)
+                await self._store.update_status(run_id, status.value, error=error)
             except Exception:
-            logger.warning("Failed to persist model_name update for run %s", run_id, exc_info=True)
+                logger.warning("Failed to persist status update for run %s", run_id, exc_info=True)
-
+        logger.info("Run %s -> %s", run_id, status.value)
-    async def update_model_name(self, run_id: str, model_name: str | None) -> None:
-        """Update the model name for a run."""
-        async with self._lock:
-            record = self._runs.get(run_id)
-            if record is None:
-                logger.warning("update_model_name called for unknown run %s", run_id)
-                return
-            record.model_name = model_name
-            record.updated_at = _now_iso()
-        await self._persist_model_name(run_id, model_name)
-        logger.info("Run %s model_name=%s", run_id, model_name)
 
     async def cancel(self, run_id: str, *, action: str = "interrupt") -> bool:
         """Request cancellation of a run.
@@ -258,17 +145,12 @@ class RunManager:
             action: "interrupt" keeps checkpoint, "rollback" reverts to pre-run state.
 
         Sets the abort event with the action reason and cancels the asyncio task.
-        Returns ``True`` if cancellation was initiated **or** the run was already
+        Returns ``True`` if the run was in-flight and cancellation was initiated.
-        interrupted (idempotent — a second cancel is a no-op success).
-        Returns ``False`` only when the run is unknown to this worker or has
-        reached a terminal state other than interrupted (completed, failed, etc.).
         """
         async with self._lock:
             record = self._runs.get(run_id)
             if record is None:
                 return False
-            if record.status == RunStatus.interrupted:
-                return True  # idempotent — already cancelled on this worker
             if record.status not in (RunStatus.pending, RunStatus.running):
                 return False
             record.abort_action = action
@@ -277,7 +159,6 @@ class RunManager:
                 record.task.cancel()
             record.status = RunStatus.interrupted
             record.updated_at = _now_iso()
-        await self._persist_status(run_id, RunStatus.interrupted)
         logger.info("Run %s cancelled (action=%s)", run_id, action)
         return True
 
@@ -290,7 +171,6 @@ class RunManager:
         metadata: dict | None = None,
         kwargs: dict | None = None,
         multitask_strategy: str = "reject",
-        model_name: str | None = None,
     ) -> RunRecord:
         """Atomically check for inflight runs and create a new one.
 
@@ -305,7 +185,6 @@ class RunManager:
         now = _now_iso()
 
         _supported_strategies = ("reject", "interrupt", "rollback")
-        interrupted_run_ids: list[str] = []
 
         async with self._lock:
             if multitask_strategy not in _supported_strategies:
@@ -324,7 +203,6 @@ class RunManager:
                         r.task.cancel()
                     r.status = RunStatus.interrupted
                     r.updated_at = now
-                    interrupted_run_ids.append(r.run_id)
                 logger.info(
                     "Cancelled %d inflight run(s) on thread %s (strategy=%s)",
                     len(inflight),
@@ -343,12 +221,9 @@ class RunManager:
                 kwargs=kwargs or {},
                 created_at=now,
                 updated_at=now,
-                model_name=model_name,
             )
             self._runs[run_id] = record
 
-        for interrupted_run_id in interrupted_run_ids:
-            await self._persist_status(interrupted_run_id, RunStatus.interrupted)
         await self._persist_to_store(record)
         logger.info("Run created: run_id=%s thread_id=%s", run_id, thread_id)
         return record

backend/packages/harness/deerflow/runtime/runs/naming.py

@@ -1,16 +0,0 @@
-"""Run naming helpers for LangChain/LangSmith tracing."""
-
-from __future__ import annotations
-
-from collections.abc import Mapping
-from typing import Any
-
-
-def resolve_root_run_name(config: Mapping[str, Any], assistant_id: str | None) -> str:
-    for container_name in ("context", "configurable"):
-        container = config.get(container_name)
-        if isinstance(container, Mapping):
-            agent_name = container.get("agent_name")
-            if isinstance(agent_name, str) and agent_name.strip():
-                return agent_name
-    return assistant_id or "lead_agent"

backend/packages/harness/deerflow/runtime/runs/store/base.py

@@ -23,7 +23,6 @@ class RunStore(abc.ABC):
         thread_id: str,
         assistant_id: str | None = None,
         user_id: str | None = None,
-        model_name: str | None = None,
         status: str = "pending",
         multitask_strategy: str = "reject",
         metadata: dict[str, Any] | None = None,
@@ -34,12 +33,7 @@ class RunStore(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def get(
+    async def get(self, run_id: str) -> dict[str, Any] | None:
-        self,
-        run_id: str,
-        *,
-        user_id: str | None = None,
-    ) -> dict[str, Any] | None:
         pass
 
     @abc.abstractmethod
@@ -66,15 +60,6 @@ class RunStore(abc.ABC):
     async def delete(self, run_id: str) -> None:
         pass
 
-    @abc.abstractmethod
-    async def update_model_name(
-        self,
-        run_id: str,
-        model_name: str | None,
-    ) -> None:
-        """Update the model_name field for an existing run."""
-        pass
-
     @abc.abstractmethod
     async def update_run_completion(
         self,

backend/packages/harness/deerflow/runtime/runs/store/memory.py

@@ -22,7 +22,6 @@ class MemoryRunStore(RunStore):
         thread_id,
         assistant_id=None,
         user_id=None,
-        model_name=None,
         status="pending",
         multitask_strategy="reject",
         metadata=None,
@@ -36,7 +35,6 @@ class MemoryRunStore(RunStore):
             "thread_id": thread_id,
             "assistant_id": assistant_id,
             "user_id": user_id,
-            "model_name": model_name,
             "status": status,
             "multitask_strategy": multitask_strategy,
             "metadata": metadata or {},
@@ -46,13 +44,8 @@ class MemoryRunStore(RunStore):
             "updated_at": now,
         }
 
-    async def get(self, run_id, *, user_id=None):
+    async def get(self, run_id):
-        run = self._runs.get(run_id)
+        return self._runs.get(run_id)
-        if run is None:
-            return None
-        if user_id is not None and run.get("user_id") != user_id:
-            return None
-        return run
 
     async def list_by_thread(self, thread_id, *, user_id=None, limit=100):
         results = [r for r in self._runs.values() if r["thread_id"] == thread_id and (user_id is None or r.get("user_id") == user_id)]
@@ -66,11 +59,6 @@ class MemoryRunStore(RunStore):
                 self._runs[run_id]["error"] = error
             self._runs[run_id]["updated_at"] = datetime.now(UTC).isoformat()
 
-    async def update_model_name(self, run_id, model_name):
-        if run_id in self._runs:
-            self._runs[run_id]["model_name"] = model_name
-            self._runs[run_id]["updated_at"] = datetime.now(UTC).isoformat()
-
     async def delete(self, run_id):
         self._runs.pop(run_id, None)
 

backend/packages/harness/deerflow/runtime/runs/worker.py

@@ -19,7 +19,6 @@ import asyncio
 import copy
 import inspect
 import logging
-import os
 from dataclasses import dataclass, field
 from functools import lru_cache
 from typing import TYPE_CHECKING, Any, Literal, cast
@@ -32,11 +31,8 @@ if TYPE_CHECKING:
 from deerflow.config.app_config import AppConfig
 from deerflow.runtime.serialization import serialize
 from deerflow.runtime.stream_bridge import StreamBridge
-from deerflow.runtime.user_context import get_effective_user_id
-from deerflow.tracing import inject_langfuse_metadata
 
 from .manager import RunManager, RunRecord
-from .naming import resolve_root_run_name
 from .schemas import RunStatus
 
 logger = logging.getLogger(__name__)
@@ -228,39 +224,12 @@ async def run_agent(
         if journal is not None:
             config.setdefault("callbacks", []).append(journal)
 
-        # Inject Langfuse trace-attribute metadata so the langchain CallbackHandler
-        # can lift session_id / user_id / trace_name / tags onto the root trace.
-        # Shared helper with ``DeerFlowClient.stream`` so both entry points stay
-        # in sync; caller-provided metadata wins via setdefault inside the helper.
-        inject_langfuse_metadata(
-            config,
-            thread_id=thread_id,
-            user_id=get_effective_user_id(),
-            assistant_id=record.assistant_id,
-            model_name=record.model_name,
-            environment=os.environ.get("DEER_FLOW_ENV") or os.environ.get("ENVIRONMENT"),
-        )
-
-        # Resolve after runtime context installation so context/configurable reflect
-        # the agent name that this run will actually execute.
-        config.setdefault("run_name", resolve_root_run_name(config, record.assistant_id))
         runnable_config = RunnableConfig(**config)
         if ctx.app_config is not None and _agent_factory_supports_app_config(agent_factory):
             agent = agent_factory(config=runnable_config, app_config=ctx.app_config)
         else:
             agent = agent_factory(config=runnable_config)
 
-        # Capture the effective (resolved) model name from the agent's metadata.
-        # _resolve_model_name in agent.py may return the default model if the
-        # requested name is not in the allowlist — this update ensures the
-        # persisted model_name reflects the actual model used.
-        if record.model_name is not None:
-            resolved = getattr(agent, "metadata", {}) or {}
-            if isinstance(resolved, dict):
-                effective = resolved.get("model_name")
-                if effective and effective != record.model_name:
-                    await run_manager.update_model_name(record.run_id, effective)
-
         # 4. Attach checkpointer and store
         if checkpointer is not None:
             agent.checkpointer = checkpointer

backend/packages/harness/deerflow/runtime/user_context.py

@@ -109,34 +109,6 @@ def get_effective_user_id() -> str:
     return str(user.id)
 
 
-def resolve_runtime_user_id(runtime: object | None) -> str:
-    """Single source of truth for a tool/middleware's effective user_id.
-
-    Resolution order (most authoritative first):
-      1. ``runtime.context["user_id"]`` — set by ``inject_authenticated_user_context``
-         in the gateway from the auth-validated ``request.state.user``. This is
-         the only source that survives boundaries where the contextvar may have
-         been lost (background tasks scheduled outside the request task,
-         worker pools that don't copy_context, future cross-process drivers).
-      2. The ``_current_user`` ContextVar — set by the auth middleware at
-         request entry. Reliable for in-task work; copied by ``asyncio``
-         child tasks and by ``ContextThreadPoolExecutor``.
-      3. ``DEFAULT_USER_ID`` — last-resort fallback so unauthenticated
-         CLI / migration / test paths keep working without raising.
-
-    Tools that persist user-scoped state (custom agents, memory, uploads)
-    MUST call this instead of ``get_effective_user_id()`` directly so they
-    benefit from the runtime.context channel that ``setup_agent`` already
-    relies on.
-    """
-    context = getattr(runtime, "context", None)
-    if isinstance(context, dict):
-        ctx_user_id = context.get("user_id")
-        if ctx_user_id:
-            return str(ctx_user_id)
-    return get_effective_user_id()
-
-
 # ---------------------------------------------------------------------------
 # Sentinel-based user_id resolution
 # ---------------------------------------------------------------------------

backend/packages/harness/deerflow/sandbox/local/local_sandbox.py

@@ -1,5 +1,4 @@
 import errno
-import logging
 import ntpath
 import os
 import shutil
@@ -8,13 +7,10 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import NamedTuple
 
-from deerflow.config.paths import VIRTUAL_PATH_PREFIX
 from deerflow.sandbox.local.list_dir import list_dir
 from deerflow.sandbox.sandbox import Sandbox
 from deerflow.sandbox.search import GrepMatch, find_glob_matches, find_grep_matches
 
-logger = logging.getLogger(__name__)
-
 
 @dataclass(frozen=True)
 class PathMapping:
@@ -383,28 +379,6 @@ class LocalSandbox(Sandbox):
             # Re-raise with the original path for clearer error messages, hiding internal resolved paths
             raise type(e)(e.errno, e.strerror, path) from None
 
-    def download_file(self, path: str) -> bytes:
-        normalised = path.replace("\\", "/")
-        stripped_path = normalised.lstrip("/")
-        allowed_prefix = VIRTUAL_PATH_PREFIX.lstrip("/")
-        if stripped_path != allowed_prefix and not stripped_path.startswith(f"{allowed_prefix}/"):
-            logger.error("Refused download outside allowed directory: path=%s, allowed_prefix=%s", path, VIRTUAL_PATH_PREFIX)
-            raise PermissionError(errno.EACCES, f"Access denied: path must be under '{VIRTUAL_PATH_PREFIX}'", path)
-
-        resolved_path = self._resolve_path(path)
-        max_download_size = 100 * 1024 * 1024
-        try:
-            file_size = os.path.getsize(resolved_path)
-            if file_size > max_download_size:
-                raise OSError(errno.EFBIG, f"File exceeds maximum download size of {max_download_size} bytes", path)
-            # TOCTOU note: the file could grow between getsize() and read(); accepted
-            # tradeoff since this is a controlled sandbox environment.
-            with open(resolved_path, "rb") as f:
-                return f.read()
-        except OSError as e:
-            # Re-raise with the original path for clearer error messages, hiding internal resolved paths
-            raise type(e)(e.errno, e.strerror, path) from None
-
     def write_file(self, path: str, content: str, append: bool = False) -> None:
         resolved = self._resolve_path_with_mapping(path)
         resolved_path = resolved.path

backend/packages/harness/deerflow/sandbox/local/local_sandbox_provider.py

@@ -1,6 +1,4 @@
 import logging
-import threading
-from collections import OrderedDict
 from pathlib import Path
 
 from deerflow.sandbox.local.local_sandbox import LocalSandbox, PathMapping
@@ -9,87 +7,25 @@ from deerflow.sandbox.sandbox_provider import SandboxProvider
 
 logger = logging.getLogger(__name__)
 
-# Module-level alias kept for backward compatibility with older callers/tests
-# that reach into ``local_sandbox_provider._singleton`` directly. New code reads
-# the provider instance attributes (``_generic_sandbox`` / ``_thread_sandboxes``)
-# instead.
 _singleton: LocalSandbox | None = None
 
-# Virtual prefixes that must be reserved by the per-thread mappings created in
-# ``acquire`` — custom mounts from ``config.yaml`` may not overlap with these.
-_USER_DATA_VIRTUAL_PREFIX = "/mnt/user-data"
-_ACP_WORKSPACE_VIRTUAL_PREFIX = "/mnt/acp-workspace"
-
-# Default upper bound on per-thread LocalSandbox instances retained in memory.
-# Each cached instance is cheap (a small Python object with a list of
-# PathMapping and a set of agent-written paths used for reverse resolve), but
-# in a long-running gateway the number of distinct thread_ids is unbounded.
-# When the cap is exceeded the least-recently-used entry is dropped; the next
-# ``acquire(thread_id)`` for that thread simply rebuilds the sandbox at the
-# cost of losing its accumulated ``_agent_written_paths`` (read_file falls
-# back to no reverse resolution, which is the same behaviour as a fresh run).
-DEFAULT_MAX_CACHED_THREAD_SANDBOXES = 256
-
 
 class LocalSandboxProvider(SandboxProvider):
-    """Local-filesystem sandbox provider with per-thread path scoping.
-
-    Earlier revisions of this provider returned a single process-wide
-    ``LocalSandbox`` keyed by the literal id ``"local"``. That singleton could
-    not honour the documented ``/mnt/user-data/...`` contract at the public
-    ``Sandbox`` API boundary because the corresponding host directory is
-    per-thread (``{base_dir}/users/{user_id}/threads/{thread_id}/user-data/``).
-
-    The provider now produces a fresh ``LocalSandbox`` per ``thread_id`` whose
-    ``path_mappings`` include thread-scoped entries for
-    ``/mnt/user-data/{workspace,uploads,outputs}`` and ``/mnt/acp-workspace``,
-    mirroring how :class:`AioSandboxProvider` bind-mounts those paths into its
-    docker container. The legacy ``acquire()`` / ``acquire(None)`` call still
-    returns a generic singleton with id ``"local"`` for callers (and tests)
-    that do not have a thread context.
-
-    Thread-safety: ``acquire``, ``get`` and ``reset`` may be invoked from
-    multiple threads (Gateway tool dispatch, subagent worker pools, the
-    background memory updater, …) so all cache state changes are serialised
-    through a provider-wide :class:`threading.Lock`. This matches the pattern
-    used by :class:`AioSandboxProvider`.
-
-    Memory bound: ``_thread_sandboxes`` is an LRU cache capped at
-    ``max_cached_threads`` (default :data:`DEFAULT_MAX_CACHED_THREAD_SANDBOXES`).
-    When the cap is exceeded the least-recently-used entry is evicted on the
-    next ``acquire``; the evicted thread's next ``acquire`` rebuilds a fresh
-    sandbox (losing only its ``_agent_written_paths`` reverse-resolve hint,
-    which gracefully degrades read_file output).
-    """
-
     uses_thread_data_mounts = True
 
-    def __init__(self, max_cached_threads: int = DEFAULT_MAX_CACHED_THREAD_SANDBOXES):
+    def __init__(self):
-        """Initialize the local sandbox provider with static path mappings.
+        """Initialize the local sandbox provider with path mappings."""
-
-        Args:
-            max_cached_threads: Upper bound on per-thread sandboxes retained in
-                the LRU cache. When exceeded, the least-recently-used entry is
-                evicted on the next ``acquire``.
-        """
         self._path_mappings = self._setup_path_mappings()
-        self._generic_sandbox: LocalSandbox | None = None
-        self._thread_sandboxes: OrderedDict[str, LocalSandbox] = OrderedDict()
-        self._max_cached_threads = max_cached_threads
-        self._lock = threading.Lock()
 
     def _setup_path_mappings(self) -> list[PathMapping]:
         """
-        Setup static path mappings shared by every sandbox this provider yields.
+        Setup path mappings for local sandbox.
 
-        Static mappings cover the skills directory and any custom mounts from
+        Maps container paths to actual local paths, including skills directory
-        ``config.yaml`` — both are process-wide and identical for every thread.
+        and any custom mounts configured in config.yaml.
-        Per-thread ``/mnt/user-data/...`` and ``/mnt/acp-workspace`` mappings
-        are appended inside :meth:`acquire` because they depend on
-        ``thread_id`` and the effective ``user_id``.
 
         Returns:
-            List of static path mappings
+            List of path mappings
         """
         mappings: list[PathMapping] = []
 
@@ -112,11 +48,7 @@ class LocalSandboxProvider(SandboxProvider):
                 )
 
             # Map custom mounts from sandbox config
-            _RESERVED_CONTAINER_PREFIXES = [
+            _RESERVED_CONTAINER_PREFIXES = [container_path, "/mnt/acp-workspace", "/mnt/user-data"]
-                container_path,
-                _ACP_WORKSPACE_VIRTUAL_PREFIX,
-                _USER_DATA_VIRTUAL_PREFIX,
-            ]
             sandbox_config = config.sandbox
             if sandbox_config and sandbox_config.mounts:
                 for mount in sandbox_config.mounts:
@@ -167,162 +99,23 @@ class LocalSandboxProvider(SandboxProvider):
 
         return mappings
 
-    @staticmethod
-    def _build_thread_path_mappings(thread_id: str) -> list[PathMapping]:
-        """Build per-thread path mappings for /mnt/user-data and /mnt/acp-workspace.
-
-        Resolves ``user_id`` via :func:`get_effective_user_id` (the same path
-        :class:`AioSandboxProvider` uses) and ensures the backing host
-        directories exist before they are mapped into the sandbox view.
-        """
-        from deerflow.config.paths import get_paths
-        from deerflow.runtime.user_context import get_effective_user_id
-
-        paths = get_paths()
-        user_id = get_effective_user_id()
-        paths.ensure_thread_dirs(thread_id, user_id=user_id)
-
-        return [
-            # Aggregate parent mapping so ``ls /mnt/user-data`` and other
-            # parent-level operations behave the same as inside AIO (where the
-            # parent directory is real and contains the three subdirs). Longer
-            # subpath mappings below still win for ``/mnt/user-data/workspace/...``
-            # because ``_find_path_mapping`` sorts by container_path length.
-            PathMapping(
-                container_path=_USER_DATA_VIRTUAL_PREFIX,
-                local_path=str(paths.sandbox_user_data_dir(thread_id, user_id=user_id)),
-                read_only=False,
-            ),
-            PathMapping(
-                container_path=f"{_USER_DATA_VIRTUAL_PREFIX}/workspace",
-                local_path=str(paths.sandbox_work_dir(thread_id, user_id=user_id)),
-                read_only=False,
-            ),
-            PathMapping(
-                container_path=f"{_USER_DATA_VIRTUAL_PREFIX}/uploads",
-                local_path=str(paths.sandbox_uploads_dir(thread_id, user_id=user_id)),
-                read_only=False,
-            ),
-            PathMapping(
-                container_path=f"{_USER_DATA_VIRTUAL_PREFIX}/outputs",
-                local_path=str(paths.sandbox_outputs_dir(thread_id, user_id=user_id)),
-                read_only=False,
-            ),
-            PathMapping(
-                container_path=_ACP_WORKSPACE_VIRTUAL_PREFIX,
-                local_path=str(paths.acp_workspace_dir(thread_id, user_id=user_id)),
-                read_only=False,
-            ),
-        ]
-
     def acquire(self, thread_id: str | None = None) -> str:
-        """Return a sandbox id scoped to *thread_id* (or the generic singleton).
-
-        - ``thread_id=None`` keeps the legacy singleton with id ``"local"`` for
-          callers that have no thread context (e.g. legacy tests, scripts).
-        - ``thread_id="abc"`` yields a per-thread ``LocalSandbox`` with id
-          ``"local:abc"`` whose ``path_mappings`` resolve ``/mnt/user-data/...``
-          to that thread's host directories.
-
-        Thread-safe under concurrent invocation: the cache check + insert is
-        guarded by ``self._lock`` so two callers racing on the same
-        ``thread_id`` always observe the same LocalSandbox instance.
-        """
         global _singleton
-
+        if _singleton is None:
-        if thread_id is None:
+            _singleton = LocalSandbox("local", path_mappings=self._path_mappings)
-            with self._lock:
+        return _singleton.id
-                if self._generic_sandbox is None:
-                    self._generic_sandbox = LocalSandbox("local", path_mappings=list(self._path_mappings))
-                    _singleton = self._generic_sandbox
-                return self._generic_sandbox.id
-
-        # Fast path under lock.
-        with self._lock:
-            cached = self._thread_sandboxes.get(thread_id)
-            if cached is not None:
-                # Mark as most-recently used so frequently-touched threads
-                # survive eviction.
-                self._thread_sandboxes.move_to_end(thread_id)
-                return cached.id
-
-        # ``_build_thread_path_mappings`` touches the filesystem
-        # (``ensure_thread_dirs``); release the lock during I/O.
-        new_mappings = list(self._path_mappings) + self._build_thread_path_mappings(thread_id)
-
-        with self._lock:
-            # Re-check after the lock-free I/O: another caller may have
-            # populated the cache while we were computing mappings.
-            cached = self._thread_sandboxes.get(thread_id)
-            if cached is None:
-                cached = LocalSandbox(f"local:{thread_id}", path_mappings=new_mappings)
-                self._thread_sandboxes[thread_id] = cached
-                self._evict_until_within_cap_locked()
-            else:
-                self._thread_sandboxes.move_to_end(thread_id)
-            return cached.id
-
-    def _evict_until_within_cap_locked(self) -> None:
-        """LRU-evict cached thread sandboxes once the cap is exceeded.
-
-        Caller MUST hold ``self._lock``.
-        """
-        while len(self._thread_sandboxes) > self._max_cached_threads:
-            evicted_thread_id, _ = self._thread_sandboxes.popitem(last=False)
-            logger.info(
-                "Evicting LocalSandbox cache entry for thread %s (cap=%d)",
-                evicted_thread_id,
-                self._max_cached_threads,
-            )
 
     def get(self, sandbox_id: str) -> Sandbox | None:
         if sandbox_id == "local":
-            with self._lock:
+            if _singleton is None:
-                generic = self._generic_sandbox
-            if generic is None:
                 self.acquire()
-                with self._lock:
+            return _singleton
-                    return self._generic_sandbox
-            return generic
-        if isinstance(sandbox_id, str) and sandbox_id.startswith("local:"):
-            thread_id = sandbox_id[len("local:") :]
-            with self._lock:
-                cached = self._thread_sandboxes.get(thread_id)
-                if cached is not None:
-                    # Touching a thread via ``get`` (used by tools.py to look
-                    # up the sandbox once per tool call) promotes it in LRU
-                    # order so an active thread isn't evicted under load.
-                    self._thread_sandboxes.move_to_end(thread_id)
-                return cached
         return None
 
     def release(self, sandbox_id: str) -> None:
-        # LocalSandbox has no resources to release; keep the cached instance so
+        # LocalSandbox uses singleton pattern - no cleanup needed.
-        # that ``_agent_written_paths`` (used to reverse-resolve agent-authored
-        # file contents on read) survives between turns. LRU eviction in
-        # ``acquire`` and explicit ``reset()`` / ``shutdown()`` are the only
-        # paths that drop cached entries.
-        #
         # Note: This method is intentionally not called by SandboxMiddleware
         # to allow sandbox reuse across multiple turns in a thread.
+        # For Docker-based providers (e.g., AioSandboxProvider), cleanup
+        # happens at application shutdown via the shutdown() method.
         pass
-
-    def reset(self) -> None:
-        """Drop all cached LocalSandbox instances.
-
-        ``reset_sandbox_provider()`` calls this to ensure config / mount
-        changes take effect on the next ``acquire()``. We also reset the
-        module-level ``_singleton`` alias so older callers/tests that reach
-        into it see a fresh state.
-        """
-        global _singleton
-        with self._lock:
-            self._generic_sandbox = None
-            self._thread_sandboxes.clear()
-            _singleton = None
-
-    def shutdown(self) -> None:
-        # LocalSandboxProvider has no extra resources beyond the cached
-        # ``LocalSandbox`` instances, so shutdown uses the same cleanup path
-        # as ``reset``.
-        self.reset()

backend/packages/harness/deerflow/sandbox/middleware.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from typing import NotRequired, override
 
@@ -49,15 +48,6 @@ class SandboxMiddleware(AgentMiddleware[SandboxMiddlewareState]):
         logger.info(f"Acquiring sandbox {sandbox_id}")
         return sandbox_id
 
-    async def _acquire_sandbox_async(self, thread_id: str) -> str:
-        provider = get_sandbox_provider()
-        sandbox_id = await provider.acquire_async(thread_id)
-        logger.info(f"Acquiring sandbox {sandbox_id}")
-        return sandbox_id
-
-    async def _release_sandbox_async(self, sandbox_id: str) -> None:
-        await asyncio.to_thread(get_sandbox_provider().release, sandbox_id)
-
     @override
     def before_agent(self, state: SandboxMiddlewareState, runtime: Runtime) -> dict | None:
         # Skip acquisition if lazy_init is enabled
@@ -74,23 +64,6 @@ class SandboxMiddleware(AgentMiddleware[SandboxMiddlewareState]):
             return {"sandbox": {"sandbox_id": sandbox_id}}
         return super().before_agent(state, runtime)
 
-    @override
-    async def abefore_agent(self, state: SandboxMiddlewareState, runtime: Runtime) -> dict | None:
-        # Skip acquisition if lazy_init is enabled
-        if self._lazy_init:
-            return await super().abefore_agent(state, runtime)
-
-        # Eager initialization (original behavior), but use the async provider
-        # hook so blocking sandbox startup/polling runs outside the event loop.
-        if "sandbox" not in state or state["sandbox"] is None:
-            thread_id = (runtime.context or {}).get("thread_id")
-            if thread_id is None:
-                return await super().abefore_agent(state, runtime)
-            sandbox_id = await self._acquire_sandbox_async(thread_id)
-            logger.info(f"Assigned sandbox {sandbox_id} to thread {thread_id}")
-            return {"sandbox": {"sandbox_id": sandbox_id}}
-        return await super().abefore_agent(state, runtime)
-
     @override
     def after_agent(self, state: SandboxMiddlewareState, runtime: Runtime) -> dict | None:
         sandbox = state.get("sandbox")
@@ -108,21 +81,3 @@ class SandboxMiddleware(AgentMiddleware[SandboxMiddlewareState]):
 
         # No sandbox to release
         return super().after_agent(state, runtime)
-
-    @override
-    async def aafter_agent(self, state: SandboxMiddlewareState, runtime: Runtime) -> dict | None:
-        sandbox = state.get("sandbox")
-        if sandbox is not None:
-            sandbox_id = sandbox["sandbox_id"]
-            logger.info(f"Releasing sandbox {sandbox_id}")
-            await self._release_sandbox_async(sandbox_id)
-            return None
-
-        if (runtime.context or {}).get("sandbox_id") is not None:
-            sandbox_id = runtime.context.get("sandbox_id")
-            logger.info(f"Releasing sandbox {sandbox_id} from context")
-            await self._release_sandbox_async(sandbox_id)
-            return None
-
-        # No sandbox to release
-        return await super().aafter_agent(state, runtime)

backend/packages/harness/deerflow/sandbox/sandbox.py

@@ -39,25 +39,6 @@ class Sandbox(ABC):
         """
         pass
 
-    @abstractmethod
-    def download_file(self, path: str) -> bytes:
-        """Download the binary content of a file.
-
-        Args:
-            path: The absolute path of the file to download.
-
-        Returns:
-            Raw file bytes.
-
-        Raises:
-            PermissionError: If path traversal is detected or the path is outside
-                the allowed virtual prefix.
-            OSError: If the file cannot be read or does not exist.  Both local
-                and remote implementations must raise ``OSError`` so callers
-                have a single exception type to handle.
-        """
-        pass
-
     @abstractmethod
     def list_dir(self, path: str, max_depth=2) -> list[str]:
         """List the contents of a directory.

backend/packages/harness/deerflow/sandbox/sandbox_provider.py

@@ -1,4 +1,3 @@
-import asyncio
 from abc import ABC, abstractmethod
 
 from deerflow.config import get_app_config
@@ -20,16 +19,6 @@ class SandboxProvider(ABC):
         """
         pass
 
-    async def acquire_async(self, thread_id: str | None = None) -> str:
-        """Acquire a sandbox without blocking the event loop.
-
-        Most sandbox providers expose a synchronous lifecycle API because local
-        Docker/provisioner operations are blocking. Async runtimes should call
-        this method so those blocking operations run in a worker thread instead
-        of stalling the event loop.
-        """
-        return await asyncio.to_thread(self.acquire, thread_id)
-
     @abstractmethod
     def get(self, sandbox_id: str) -> Sandbox | None:
         """Get a sandbox environment by ID.
@@ -48,10 +37,6 @@ class SandboxProvider(ABC):
         """
         pass
 
-    def reset(self) -> None:
-        """Clear cached state that survives provider instance replacement."""
-        pass
-
 
 _default_sandbox_provider: SandboxProvider | None = None
 
@@ -80,17 +65,10 @@ def reset_sandbox_provider() -> None:
     The next call to `get_sandbox_provider()` will create a new instance.
     Useful for testing or when switching configurations.
 
-    Providers can override `reset()` to clear any module-level state they keep
-    alive across instances (for example, `LocalSandboxProvider`'s cached
-    `LocalSandbox` singleton). Without it, config/mount changes would not take
-    effect on the next acquire().
-
     Note: If the provider has active sandboxes, they will be orphaned.
     Use `shutdown_sandbox_provider()` for proper cleanup.
     """
     global _default_sandbox_provider
-    if _default_sandbox_provider is not None:
-        _default_sandbox_provider.reset()
     _default_sandbox_provider = None
 
 

backend/packages/harness/deerflow/sandbox/tools.py

@@ -1,8 +1,6 @@
-import asyncio
 import posixpath
 import re
 import shlex
-from collections.abc import Callable
 from pathlib import Path
 
 from langchain.tools import tool
@@ -42,7 +40,6 @@ _DEFAULT_GLOB_MAX_RESULTS = 200
 _MAX_GLOB_MAX_RESULTS = 1000
 _DEFAULT_GREP_MAX_RESULTS = 100
 _MAX_GREP_MAX_RESULTS = 500
-_DEFAULT_WRITE_FILE_ERROR_MAX_CHARS = 2000
 _LOCAL_BASH_CWD_COMMANDS = {"cd", "pushd"}
 _LOCAL_BASH_COMMAND_WRAPPERS = {"command", "builtin"}
 _LOCAL_BASH_COMMAND_PREFIX_KEYWORDS = {"!", "{", "case", "do", "elif", "else", "for", "if", "select", "then", "time", "until", "while"}
@@ -436,42 +433,6 @@ def _sanitize_error(error: Exception, runtime: Runtime | None = None) -> str:
     return msg
 
 
-def _truncate_write_file_error_detail(detail: str, max_chars: int) -> str:
-    """Middle-truncate write_file error details, preserving the head and tail."""
-    if max_chars == 0:
-        return detail
-    if len(detail) <= max_chars:
-        return detail
-    total = len(detail)
-    marker_max_len = len(f"\n... [write_file error truncated: {total} chars skipped] ...\n")
-    kept = max(0, max_chars - marker_max_len)
-    if kept == 0:
-        return detail[:max_chars]
-    head_len = kept // 2
-    tail_len = kept - head_len
-    skipped = total - kept
-    marker = f"\n... [write_file error truncated: {skipped} chars skipped] ...\n"
-    return f"{detail[:head_len]}{marker}{detail[-tail_len:] if tail_len > 0 else ''}"
-
-
-def _format_write_file_error(
-    requested_path: str,
-    error: Exception,
-    runtime: Runtime | None = None,
-    *,
-    max_chars: int = _DEFAULT_WRITE_FILE_ERROR_MAX_CHARS,
-) -> str:
-    """Return a bounded, sanitized error string for write_file failures."""
-    header = f"Error: Failed to write file '{requested_path}'"
-    detail = _sanitize_error(error, runtime)
-    if max_chars == 0:
-        return f"{header}: {detail}"
-    detail_budget = max_chars - len(header) - 2
-    if detail_budget <= 0:
-        return _truncate_write_file_error_detail(f"{header}: {detail}", max_chars)
-    return f"{header}: {_truncate_write_file_error_detail(detail, detail_budget)}"
-
-
 def replace_virtual_path(path: str, thread_data: ThreadDataState | None) -> str:
     """Replace virtual /mnt/user-data paths with actual thread data paths.
 
@@ -1045,9 +1006,8 @@ def get_thread_data(runtime: Runtime | None) -> ThreadDataState | None:
 def is_local_sandbox(runtime: Runtime | None) -> bool:
     """Check if the current sandbox is a local sandbox.
 
-    Accepts both the legacy generic id ``"local"`` (acquire with no thread
+    Path replacement is only needed for local sandbox since aio sandbox
-    context) and the per-thread id format ``"local:{thread_id}"`` produced by
+    already has /mnt/user-data mounted in the container.
-    :meth:`LocalSandboxProvider.acquire` once a thread is known.
     """
     if runtime is None:
         return False
@@ -1056,10 +1016,7 @@ def is_local_sandbox(runtime: Runtime | None) -> bool:
     sandbox_state = runtime.state.get("sandbox")
     if sandbox_state is None:
         return False
-    sandbox_id = sandbox_state.get("sandbox_id")
+    return sandbox_state.get("sandbox_id") == "local"
-    if not isinstance(sandbox_id, str):
-        return False
-    return sandbox_id == "local" or sandbox_id.startswith("local:")
 
 
 def sandbox_from_runtime(runtime: Runtime | None = None) -> Sandbox:
@@ -1150,68 +1107,6 @@ def ensure_sandbox_initialized(runtime: Runtime | None = None) -> Sandbox:
     return sandbox
 
 
-async def ensure_sandbox_initialized_async(runtime: Runtime | None = None) -> Sandbox:
-    """Async counterpart to ``ensure_sandbox_initialized`` for tool runtimes.
-
-    This keeps lazy sandbox acquisition on the async provider hook, so AIO
-    sandbox startup and readiness polling do not fall back to synchronous
-    ``provider.acquire()`` during async tool execution.
-    """
-    if runtime is None:
-        raise SandboxRuntimeError("Tool runtime not available")
-
-    if runtime.state is None:
-        raise SandboxRuntimeError("Tool runtime state not available")
-
-    sandbox_state = runtime.state.get("sandbox")
-    if sandbox_state is not None:
-        sandbox_id = sandbox_state.get("sandbox_id")
-        if sandbox_id is not None:
-            sandbox = get_sandbox_provider().get(sandbox_id)
-            if sandbox is not None:
-                if runtime.context is not None:
-                    runtime.context["sandbox_id"] = sandbox_id
-                return sandbox
-
-    thread_id = runtime.context.get("thread_id") if runtime.context else None
-    if thread_id is None:
-        thread_id = runtime.config.get("configurable", {}).get("thread_id") if runtime.config else None
-    if thread_id is None:
-        raise SandboxRuntimeError("Thread ID not available in runtime context")
-
-    provider = get_sandbox_provider()
-    sandbox_id = await provider.acquire_async(thread_id)
-
-    runtime.state["sandbox"] = {"sandbox_id": sandbox_id}
-
-    sandbox = provider.get(sandbox_id)
-    if sandbox is None:
-        raise SandboxNotFoundError("Sandbox not found after acquisition", sandbox_id=sandbox_id)
-
-    if runtime.context is not None:
-        runtime.context["sandbox_id"] = sandbox_id
-    return sandbox
-
-
-async def _run_sync_tool_after_async_sandbox_init(
-    func: Callable[..., str] | None,
-    runtime: Runtime,
-    *args: object,
-) -> str:
-    """Initialize lazily via async provider, then run sync tool body off-thread."""
-    try:
-        await ensure_sandbox_initialized_async(runtime)
-    except SandboxError as e:
-        return f"Error: {e}"
-    except Exception as e:
-        return f"Error: Unexpected error initializing sandbox: {_sanitize_error(e, runtime)}"
-
-    if func is None:
-        return "Error: Tool implementation not available"
-
-    return await asyncio.to_thread(func, runtime, *args)
-
-
 def ensure_thread_directories_exist(runtime: Runtime | None) -> None:
     """Ensure thread data directories (workspace, uploads, outputs) exist.
 
@@ -1374,13 +1269,6 @@ def bash_tool(runtime: Runtime, description: str, command: str) -> str:
         return f"Error: Unexpected error executing command: {_sanitize_error(e, runtime)}"
 
 
-async def _bash_tool_async(runtime: Runtime, description: str, command: str) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(bash_tool.func, runtime, description, command)
-
-
-bash_tool.coroutine = _bash_tool_async
-
-
 @tool("ls", parse_docstring=True)
 def ls_tool(runtime: Runtime, description: str, path: str) -> str:
     """List the contents of a directory up to 2 levels deep in tree format.
@@ -1428,13 +1316,6 @@ def ls_tool(runtime: Runtime, description: str, path: str) -> str:
         return f"Error: Unexpected error listing directory: {_sanitize_error(e, runtime)}"
 
 
-async def _ls_tool_async(runtime: Runtime, description: str, path: str) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(ls_tool.func, runtime, description, path)
-
-
-ls_tool.coroutine = _ls_tool_async
-
-
 @tool("glob", parse_docstring=True)
 def glob_tool(
     runtime: Runtime,
@@ -1485,28 +1366,6 @@ def glob_tool(
         return f"Error: Unexpected error searching paths: {_sanitize_error(e, runtime)}"
 
 
-async def _glob_tool_async(
-    runtime: Runtime,
-    description: str,
-    pattern: str,
-    path: str,
-    include_dirs: bool = False,
-    max_results: int = _DEFAULT_GLOB_MAX_RESULTS,
-) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(
-        glob_tool.func,
-        runtime,
-        description,
-        pattern,
-        path,
-        include_dirs,
-        max_results,
-    )
-
-
-glob_tool.coroutine = _glob_tool_async
-
-
 @tool("grep", parse_docstring=True)
 def grep_tool(
     runtime: Runtime,
@@ -1577,32 +1436,6 @@ def grep_tool(
         return f"Error: Unexpected error searching file contents: {_sanitize_error(e, runtime)}"
 
 
-async def _grep_tool_async(
-    runtime: Runtime,
-    description: str,
-    pattern: str,
-    path: str,
-    glob: str | None = None,
-    literal: bool = False,
-    case_sensitive: bool = False,
-    max_results: int = _DEFAULT_GREP_MAX_RESULTS,
-) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(
-        grep_tool.func,
-        runtime,
-        description,
-        pattern,
-        path,
-        glob,
-        literal,
-        case_sensitive,
-        max_results,
-    )
-
-
-grep_tool.coroutine = _grep_tool_async
-
-
 @tool("read_file", parse_docstring=True)
 def read_file_tool(
     runtime: Runtime,
@@ -1658,19 +1491,6 @@ def read_file_tool(
         return f"Error: Unexpected error reading file: {_sanitize_error(e, runtime)}"
 
 
-async def _read_file_tool_async(
-    runtime: Runtime,
-    description: str,
-    path: str,
-    start_line: int | None = None,
-    end_line: int | None = None,
-) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(read_file_tool.func, runtime, description, path, start_line, end_line)
-
-
-read_file_tool.coroutine = _read_file_tool_async
-
-
 @tool("write_file", parse_docstring=True)
 def write_file_tool(
     runtime: Runtime,
@@ -1679,18 +1499,17 @@ def write_file_tool(
     content: str,
     append: bool = False,
 ) -> str:
-    """Write text content to a file. By default this overwrites the target file; set append to true to add content to the end without replacing existing content.
+    """Write text content to a file.
 
     Args:
         description: Explain why you are writing to this file in short words. ALWAYS PROVIDE THIS PARAMETER FIRST.
         path: The **absolute** path to the file to write to. ALWAYS PROVIDE THIS PARAMETER SECOND.
         content: The content to write to the file. ALWAYS PROVIDE THIS PARAMETER THIRD.
-        append: Whether to append content to the end of the file instead of overwriting it. Defaults to false.
     """
     try:
-        requested_path = path
         sandbox = ensure_sandbox_initialized(runtime)
         ensure_thread_directories_exist(runtime)
+        requested_path = path
         if is_local_sandbox(runtime):
             thread_data = get_thread_data(runtime)
             validate_local_tool_path(path, thread_data)
@@ -1701,34 +1520,15 @@ def write_file_tool(
             sandbox.write_file(path, content, append)
         return "OK"
     except SandboxError as e:
-        return _format_write_file_error(requested_path, e, runtime)
+        return f"Error: {e}"
     except PermissionError:
-        return _truncate_write_file_error_detail(
+        return f"Error: Permission denied writing to file: {requested_path}"
-            f"Error: Permission denied writing to file: {requested_path}",
-            _DEFAULT_WRITE_FILE_ERROR_MAX_CHARS,
-        )
     except IsADirectoryError:
-        return _truncate_write_file_error_detail(
+        return f"Error: Path is a directory, not a file: {requested_path}"
-            f"Error: Path is a directory, not a file: {requested_path}",
-            _DEFAULT_WRITE_FILE_ERROR_MAX_CHARS,
-        )
     except OSError as e:
-        return _format_write_file_error(requested_path, e, runtime)
+        return f"Error: Failed to write file '{requested_path}': {_sanitize_error(e, runtime)}"
     except Exception as e:
-        return _format_write_file_error(requested_path, e, runtime)
+        return f"Error: Unexpected error writing file: {_sanitize_error(e, runtime)}"
-
-
-async def _write_file_tool_async(
-    runtime: Runtime,
-    description: str,
-    path: str,
-    content: str,
-    append: bool = False,
-) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(write_file_tool.func, runtime, description, path, content, append)
-
-
-write_file_tool.coroutine = _write_file_tool_async
 
 
 @tool("str_replace", parse_docstring=True)
@@ -1780,25 +1580,3 @@ def str_replace_tool(
         return f"Error: Permission denied accessing file: {requested_path}"
     except Exception as e:
         return f"Error: Unexpected error replacing string: {_sanitize_error(e, runtime)}"
-
-
-async def _str_replace_tool_async(
-    runtime: Runtime,
-    description: str,
-    path: str,
-    old_str: str,
-    new_str: str,
-    replace_all: bool = False,
-) -> str:
-    return await _run_sync_tool_after_async_sandbox_init(
-        str_replace_tool.func,
-        runtime,
-        description,
-        path,
-        old_str,
-        new_str,
-        replace_all,
-    )
-
-
-str_replace_tool.coroutine = _str_replace_tool_async

backend/packages/harness/deerflow/skills/security_scanner.py

@@ -23,48 +23,18 @@ class ScanResult:
 
 def _extract_json_object(raw: str) -> dict | None:
     raw = raw.strip()
-
-    # Strip markdown code fences (```json ... ``` or ``` ... ```)
-    fence_match = re.match(r"^```(?:json)?\s*\n?(.*?)\n?\s*```$", raw, re.DOTALL)
-    if fence_match:
-        raw = fence_match.group(1).strip()
-
     try:
         return json.loads(raw)
     except json.JSONDecodeError:
         pass
 
-    # Brace-balanced extraction with string-awareness
+    match = re.search(r"\{.*\}", raw, re.DOTALL)
-    start = raw.find("{")
+    if not match:
-    if start == -1:
         return None
-
-    depth = 0
-    in_string = False
-    escape = False
-    for i in range(start, len(raw)):
-        c = raw[i]
-        if escape:
-            escape = False
-            continue
-        if c == "\\":
-            escape = True
-            continue
-        if c == '"':
-            in_string = not in_string
-            continue
-        if in_string:
-            continue
-        if c == "{":
-            depth += 1
-        elif c == "}":
-            depth -= 1
-            if depth == 0:
     try:
-                    return json.loads(raw[start : i + 1])
+        return json.loads(match.group(0))
     except json.JSONDecodeError:
         return None
-    return None
 
 
 async def scan_skill_content(content: str, *, executable: bool = False, location: str = SKILL_MD_FILE, app_config: AppConfig | None = None) -> ScanResult:
@@ -74,12 +44,10 @@ async def scan_skill_content(content: str, *, executable: bool = False, location
         "Classify the content as allow, warn, or block. "
         "Block clear prompt-injection, system-role override, privilege escalation, exfiltration, "
         "or unsafe executable code. Warn for borderline external API references. "
-        "Respond with ONLY a single JSON object on one line, no code fences, no commentary:\n"
+        'Return strict JSON: {"decision":"allow|warn|block","reason":"..."}.'
-        '{"decision":"allow|warn|block","reason":"..."}'
     )
     prompt = f"Location: {location}\nExecutable: {str(executable).lower()}\n\nReview this content:\n-----\n{content}\n-----"
 
-    model_responded = False
     try:
         config = app_config or get_app_config()
         model_name = config.skill_evolution.moderation_model_name
@@ -91,19 +59,12 @@ async def scan_skill_content(content: str, *, executable: bool = False, location
             ],
             config={"run_name": "security_agent"},
         )
-        model_responded = True
+        parsed = _extract_json_object(str(getattr(response, "content", "") or ""))
-        raw = str(getattr(response, "content", "") or "")
+        if parsed and parsed.get("decision") in {"allow", "warn", "block"}:
-        parsed = _extract_json_object(raw)
+            return ScanResult(parsed["decision"], str(parsed.get("reason") or "No reason provided."))
-        if parsed:
-            decision = str(parsed.get("decision", "")).lower()
-            if decision in {"allow", "warn", "block"}:
-                return ScanResult(decision, str(parsed.get("reason") or "No reason provided."))
-        logger.warning("Security scan produced unparseable output: %s", raw[:200])
     except Exception:
         logger.warning("Skill security scan model call failed; using conservative fallback", exc_info=True)
 
-    if model_responded:
-        return ScanResult("block", "Security scan produced unparseable output; manual review required.")
     if executable:
         return ScanResult("block", "Security scan unavailable for executable content; manual review required.")
     return ScanResult("block", "Security scan unavailable for skill content; manual review required.")

backend/packages/harness/deerflow/subagents/config.py

@@ -26,7 +26,7 @@ class SubagentConfig:
 
     name: str
     description: str
-    system_prompt: str | None = None
+    system_prompt: str
     tools: list[str] | None = None
     disallowed_tools: list[str] | None = field(default_factory=lambda: ["task"])
     skills: list[str] | None = None

backend/packages/harness/deerflow/subagents/executor.py

@@ -26,7 +26,6 @@ from deerflow.models import create_chat_model
 from deerflow.skills.tool_policy import filter_tools_by_skill_allowed_tools
 from deerflow.skills.types import Skill
 from deerflow.subagents.config import SubagentConfig, resolve_subagent_model_name
-from deerflow.subagents.token_collector import SubagentTokenCollector
 
 logger = logging.getLogger(__name__)
 
@@ -47,15 +46,6 @@ class SubagentStatus(Enum):
     CANCELLED = "cancelled"
     TIMED_OUT = "timed_out"
 
-    @property
-    def is_terminal(self) -> bool:
-        return self in {
-            type(self).COMPLETED,
-            type(self).FAILED,
-            type(self).CANCELLED,
-            type(self).TIMED_OUT,
-        }
-
 
 @dataclass
 class SubagentResult:
@@ -80,51 +70,13 @@ class SubagentResult:
     started_at: datetime | None = None
     completed_at: datetime | None = None
     ai_messages: list[dict[str, Any]] | None = None
-    token_usage_records: list[dict[str, int | str]] = field(default_factory=list)
-    usage_reported: bool = False
     cancel_event: threading.Event = field(default_factory=threading.Event, repr=False)
-    _state_lock: threading.Lock = field(default_factory=threading.Lock, init=False, repr=False)
 
     def __post_init__(self):
         """Initialize mutable defaults."""
         if self.ai_messages is None:
             self.ai_messages = []
 
-    def try_set_terminal(
-        self,
-        status: SubagentStatus,
-        *,
-        result: str | None = None,
-        error: str | None = None,
-        completed_at: datetime | None = None,
-        ai_messages: list[dict[str, Any]] | None = None,
-        token_usage_records: list[dict[str, int | str]] | None = None,
-    ) -> bool:
-        """Set a terminal status exactly once.
-
-        Background timeout/cancellation and the execution worker can race on the
-        same result holder.  The first terminal transition wins; late terminal
-        writes must not change status or payload fields.
-        """
-        if not status.is_terminal:
-            raise ValueError(f"Status {status} is not terminal")
-
-        with self._state_lock:
-            if self.status.is_terminal:
-                return False
-
-            if result is not None:
-                self.result = result
-            if error is not None:
-                self.error = error
-            if ai_messages is not None:
-                self.ai_messages = ai_messages
-            if token_usage_records is not None:
-                self.token_usage_records = token_usage_records
-            self.completed_at = completed_at or datetime.now()
-            self.status = status
-            return True
-
 
 # Global storage for background task results
 _background_tasks: dict[str, SubagentResult] = {}
@@ -331,13 +283,11 @@ class SubagentExecutor:
         # Reuse shared middleware composition with lead agent.
         middlewares = build_subagent_runtime_middlewares(app_config=app_config, model_name=self.model_name, lazy_init=True)
 
-        # system_prompt is included in initial state messages (see _build_initial_state)
-        # to avoid multiple SystemMessages which some LLM APIs don't support.
         return create_agent(
             model=model,
             tools=tools if tools is not None else self.tools,
             middleware=middlewares,
-            system_prompt=None,
+            system_prompt=self.config.system_prompt,
             state_schema=ThreadState,
         )
 
@@ -412,25 +362,14 @@ class SubagentExecutor:
         Returns:
             Initial state dictionary and tools filtered by loaded skill metadata.
         """
-
         # Load skills as conversation items (Codex pattern)
         skills = await self._load_skills()
         filtered_tools = self._apply_skill_allowed_tools(skills)
         skill_messages = await self._load_skill_messages(skills)
 
-        # Combine system_prompt and skills into a single SystemMessage.
-        # Some LLM APIs reject multiple SystemMessages with
-        # "System message must be at the beginning."
-        system_parts: list[str] = []
-        if self.config.system_prompt:
-            system_parts.append(self.config.system_prompt)
-        for skill_msg in skill_messages:
-            system_parts.append(skill_msg.content)
-
         messages: list[Any] = []
-        if system_parts:
+        # Skill content injected as developer/system messages before the task
-            messages.append(SystemMessage(content="\n\n".join(system_parts)))
+        messages.extend(skill_messages)
-
         # Then the actual task
         messages.append(HumanMessage(content=task))
 
@@ -473,20 +412,13 @@ class SubagentExecutor:
             ai_messages = []
             result.ai_messages = ai_messages
 
-        collector: SubagentTokenCollector | None = None
         try:
             state, filtered_tools = await self._build_initial_state(task)
             agent = self._create_agent(filtered_tools)
 
-            # Token collector for subagent LLM calls
-            collector_caller = f"subagent:{self.config.name}"
-            collector = SubagentTokenCollector(caller=collector_caller)
-
             # Build config with thread_id for sandbox access and recursion limit
             run_config: RunnableConfig = {
                 "recursion_limit": self.config.max_turns,
-                "callbacks": [collector],
-                "tags": [collector_caller],
             }
             context: dict[str, Any] = {}
             if self.thread_id:
@@ -504,11 +436,11 @@ class SubagentExecutor:
             # Pre-check: bail out immediately if already cancelled before streaming starts
             if result.cancel_event.is_set():
                 logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} cancelled before streaming")
-                result.try_set_terminal(
+                with _background_tasks_lock:
-                    SubagentStatus.CANCELLED,
+                    if result.status == SubagentStatus.RUNNING:
-                    error="Cancelled by user",
+                        result.status = SubagentStatus.CANCELLED
-                    token_usage_records=collector.snapshot_records(),
+                        result.error = "Cancelled by user"
-                )
+                        result.completed_at = datetime.now()
                 return result
 
             async for chunk in agent.astream(state, config=run_config, context=context, stream_mode="values"):  # type: ignore[arg-type]
@@ -518,11 +450,11 @@ class SubagentExecutor:
                 # interrupted until the next chunk is yielded.
                 if result.cancel_event.is_set():
                     logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} cancelled by parent")
-                    result.try_set_terminal(
+                    with _background_tasks_lock:
-                        SubagentStatus.CANCELLED,
+                        if result.status == SubagentStatus.RUNNING:
-                        error="Cancelled by user",
+                            result.status = SubagentStatus.CANCELLED
-                        token_usage_records=collector.snapshot_records(),
+                            result.error = "Cancelled by user"
-                    )
+                            result.completed_at = datetime.now()
                     return result
 
                 final_state = chunk
@@ -549,12 +481,10 @@ class SubagentExecutor:
                             logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} captured AI message #{len(ai_messages)}")
 
             logger.info(f"[trace={self.trace_id}] Subagent {self.config.name} completed async execution")
-            token_usage_records = collector.snapshot_records()
-            final_result: str | None = None
 
             if final_state is None:
                 logger.warning(f"[trace={self.trace_id}] Subagent {self.config.name} no final state")
-                final_result = "No response generated"
+                result.result = "No response generated"
             else:
                 # Extract the final message - find the last AIMessage
                 messages = final_state.get("messages", [])
@@ -571,7 +501,7 @@ class SubagentExecutor:
                     content = last_ai_message.content
                     # Handle both str and list content types for the final result
                     if isinstance(content, str):
-                        final_result = content
+                        result.result = content
                     elif isinstance(content, list):
                         # Extract text from list of content blocks for final result only.
                         # Concatenate raw string chunks directly, but preserve separation
@@ -590,16 +520,16 @@ class SubagentExecutor:
                                     text_parts.append(text_val)
                         if pending_str_parts:
                             text_parts.append("".join(pending_str_parts))
-                        final_result = "\n".join(text_parts) if text_parts else "No text content in response"
+                        result.result = "\n".join(text_parts) if text_parts else "No text content in response"
                     else:
-                        final_result = str(content)
+                        result.result = str(content)
                 elif messages:
                     # Fallback: use the last message if no AIMessage found
                     last_message = messages[-1]
                     logger.warning(f"[trace={self.trace_id}] Subagent {self.config.name} no AIMessage found, using last message: {type(last_message)}")
                     raw_content = last_message.content if hasattr(last_message, "content") else str(last_message)
                     if isinstance(raw_content, str):
-                        final_result = raw_content
+                        result.result = raw_content
                     elif isinstance(raw_content, list):
                         parts = []
                         pending_str_parts = []
@@ -615,29 +545,21 @@ class SubagentExecutor:
                                     parts.append(text_val)
                         if pending_str_parts:
                             parts.append("".join(pending_str_parts))
-                        final_result = "\n".join(parts) if parts else "No text content in response"
+                        result.result = "\n".join(parts) if parts else "No text content in response"
                     else:
-                        final_result = str(raw_content)
+                        result.result = str(raw_content)
                 else:
                     logger.warning(f"[trace={self.trace_id}] Subagent {self.config.name} no messages in final state")
-                    final_result = "No response generated"
+                    result.result = "No response generated"
 
-            if final_result is None:
+            result.status = SubagentStatus.COMPLETED
-                final_result = "No response generated"
+            result.completed_at = datetime.now()
-
-            result.try_set_terminal(
-                SubagentStatus.COMPLETED,
-                result=final_result,
-                token_usage_records=token_usage_records,
-            )
 
         except Exception as e:
             logger.exception(f"[trace={self.trace_id}] Subagent {self.config.name} async execution failed")
-            result.try_set_terminal(
+            result.status = SubagentStatus.FAILED
-                SubagentStatus.FAILED,
+            result.error = str(e)
-                error=str(e),
+            result.completed_at = datetime.now()
-                token_usage_records=collector.snapshot_records() if collector is not None else None,
-            )
 
         return result
 
@@ -716,9 +638,11 @@ class SubagentExecutor:
                 result = SubagentResult(
                     task_id=str(uuid.uuid4())[:8],
                     trace_id=self.trace_id,
-                    status=SubagentStatus.RUNNING,
+                    status=SubagentStatus.FAILED,
                 )
-            result.try_set_terminal(SubagentStatus.FAILED, error=str(e))
+            result.status = SubagentStatus.FAILED
+            result.error = str(e)
+            result.completed_at = datetime.now()
             return result
 
     def execute_async(self, task: str, task_id: str | None = None) -> str:
@@ -765,21 +689,29 @@ class SubagentExecutor:
                 )
                 try:
                     # Wait for execution with timeout
-                    execution_future.result(timeout=self.config.timeout_seconds)
+                    exec_result = execution_future.result(timeout=self.config.timeout_seconds)
+                    with _background_tasks_lock:
+                        _background_tasks[task_id].status = exec_result.status
+                        _background_tasks[task_id].result = exec_result.result
+                        _background_tasks[task_id].error = exec_result.error
+                        _background_tasks[task_id].completed_at = datetime.now()
+                        _background_tasks[task_id].ai_messages = exec_result.ai_messages
                 except FuturesTimeoutError:
                     logger.error(f"[trace={self.trace_id}] Subagent {self.config.name} execution timed out after {self.config.timeout_seconds}s")
+                    with _background_tasks_lock:
+                        if _background_tasks[task_id].status == SubagentStatus.RUNNING:
+                            _background_tasks[task_id].status = SubagentStatus.TIMED_OUT
+                            _background_tasks[task_id].error = f"Execution timed out after {self.config.timeout_seconds} seconds"
+                            _background_tasks[task_id].completed_at = datetime.now()
                     # Signal cooperative cancellation and cancel the future
                     result_holder.cancel_event.set()
-                    result_holder.try_set_terminal(
-                        SubagentStatus.TIMED_OUT,
-                        error=f"Execution timed out after {self.config.timeout_seconds} seconds",
-                    )
                     execution_future.cancel()
             except Exception as e:
                 logger.exception(f"[trace={self.trace_id}] Subagent {self.config.name} async execution failed")
                 with _background_tasks_lock:
-                    task_result = _background_tasks[task_id]
+                    _background_tasks[task_id].status = SubagentStatus.FAILED
-                task_result.try_set_terminal(SubagentStatus.FAILED, error=str(e))
+                    _background_tasks[task_id].error = str(e)
+                    _background_tasks[task_id].completed_at = datetime.now()
 
         _scheduler_pool.submit(run_task)
         return task_id
@@ -850,7 +782,13 @@ def cleanup_background_task(task_id: str) -> None:
 
         # Only clean up tasks that are in a terminal state to avoid races with
         # the background executor still updating the task entry.
-        if result.status.is_terminal or result.completed_at is not None:
+        is_terminal_status = result.status in {
+            SubagentStatus.COMPLETED,
+            SubagentStatus.FAILED,
+            SubagentStatus.CANCELLED,
+            SubagentStatus.TIMED_OUT,
+        }
+        if is_terminal_status or result.completed_at is not None:
             del _background_tasks[task_id]
             logger.debug("Cleaned up background task: %s", task_id)
         else:

backend/packages/harness/deerflow/subagents/token_collector.py

@@ -1,63 +0,0 @@
-"""Callback handler that collects LLM token usage within a subagent.
-
-Each subagent execution creates its own collector. After the subagent
-finishes, the collected records are transferred to the parent RunJournal
-via :meth:`RunJournal.record_external_llm_usage_records`.
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from langchain_core.callbacks import BaseCallbackHandler
-
-
-class SubagentTokenCollector(BaseCallbackHandler):
-    """Lightweight callback handler that collects LLM token usage within a subagent."""
-
-    def __init__(self, caller: str):
-        super().__init__()
-        self.caller = caller
-        self._records: list[dict[str, int | str]] = []
-        self._counted_run_ids: set[str] = set()
-
-    def on_llm_end(
-        self,
-        response: Any,
-        *,
-        run_id: Any,
-        tags: list[str] | None = None,
-        **kwargs: Any,
-    ) -> None:
-        rid = str(run_id)
-        if rid in self._counted_run_ids:
-            return
-
-        for generation in response.generations:
-            for gen in generation:
-                if not hasattr(gen, "message"):
-                    continue
-                usage = getattr(gen.message, "usage_metadata", None)
-                usage_dict = dict(usage) if usage else {}
-                input_tk = usage_dict.get("input_tokens", 0) or 0
-                output_tk = usage_dict.get("output_tokens", 0) or 0
-                total_tk = usage_dict.get("total_tokens", 0) or 0
-                if total_tk <= 0:
-                    total_tk = input_tk + output_tk
-                if total_tk <= 0:
-                    continue
-                self._counted_run_ids.add(rid)
-                self._records.append(
-                    {
-                        "source_run_id": rid,
-                        "caller": self.caller,
-                        "input_tokens": input_tk,
-                        "output_tokens": output_tk,
-                        "total_tokens": total_tk,
-                    }
-                )
-                return
-
-    def snapshot_records(self) -> list[dict[str, int | str]]:
-        """Return a copy of the accumulated usage records."""
-        return list(self._records)

backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py

@@ -7,13 +7,20 @@ from langgraph.types import Command
 
 from deerflow.config.agents_config import validate_agent_name
 from deerflow.config.paths import get_paths
-from deerflow.runtime.user_context import resolve_runtime_user_id
+from deerflow.runtime.user_context import get_effective_user_id
 from deerflow.tools.types import Runtime
 
 logger = logging.getLogger(__name__)
 
 
-@tool(parse_docstring=True)
+def _get_runtime_user_id(runtime: Runtime) -> str:
+    context_user_id = runtime.context.get("user_id") if runtime.context else None
+    if context_user_id:
+        return str(context_user_id)
+    return get_effective_user_id()
+
+
+@tool
 def setup_agent(
     soul: str,
     description: str,
@@ -38,7 +45,7 @@ def setup_agent(
         if agent_name:
             # Custom agents are persisted under the current user's bucket so
             # different users do not see each other's agents.
-            user_id = resolve_runtime_user_id(runtime)
+            user_id = _get_runtime_user_id(runtime)
             agent_dir = paths.user_agent_dir(user_id, agent_name)
         else:
             # Default agent (no agent_name): SOUL.md lives at the global base dir.

backend/packages/harness/deerflow/tools/builtins/task_tool.py

@@ -7,7 +7,6 @@ from dataclasses import replace
 from typing import TYPE_CHECKING, Annotated, Any, cast
 
 from langchain.tools import InjectedToolCallId, tool
-from langchain_core.callbacks import BaseCallbackManager
 from langgraph.config import get_stream_writer
 
 from deerflow.config import get_app_config
@@ -27,141 +26,6 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
-# Cache subagent token usage by tool_call_id so TokenUsageMiddleware can
-# write it back to the triggering AIMessage's usage_metadata.
-_subagent_usage_cache: dict[str, dict[str, int]] = {}
-
-
-def _token_usage_cache_enabled(app_config: "AppConfig | None") -> bool:
-    if app_config is None:
-        try:
-            app_config = get_app_config()
-        except FileNotFoundError:
-            return False
-    return bool(getattr(getattr(app_config, "token_usage", None), "enabled", False))
-
-
-def _cache_subagent_usage(tool_call_id: str, usage: dict | None, *, enabled: bool = True) -> None:
-    if enabled and usage:
-        _subagent_usage_cache[tool_call_id] = usage
-
-
-def pop_cached_subagent_usage(tool_call_id: str) -> dict | None:
-    return _subagent_usage_cache.pop(tool_call_id, None)
-
-
-def _is_subagent_terminal(result: Any) -> bool:
-    """Return whether a background subagent result is safe to clean up."""
-    return result.status in {SubagentStatus.COMPLETED, SubagentStatus.FAILED, SubagentStatus.CANCELLED, SubagentStatus.TIMED_OUT} or getattr(result, "completed_at", None) is not None
-
-
-async def _await_subagent_terminal(task_id: str, max_polls: int) -> Any | None:
-    """Poll until the background subagent reaches a terminal status or we run out of polls."""
-    for _ in range(max_polls):
-        result = get_background_task_result(task_id)
-        if result is None:
-            return None
-        if _is_subagent_terminal(result):
-            return result
-        await asyncio.sleep(5)
-    return None
-
-
-async def _deferred_cleanup_subagent_task(task_id: str, trace_id: str, max_polls: int) -> None:
-    """Keep polling a cancelled subagent until it can be safely removed."""
-    cleanup_poll_count = 0
-    while True:
-        result = get_background_task_result(task_id)
-        if result is None:
-            return
-        if _is_subagent_terminal(result):
-            cleanup_background_task(task_id)
-            return
-        if cleanup_poll_count >= max_polls:
-            logger.warning(f"[trace={trace_id}] Deferred cleanup for task {task_id} timed out after {cleanup_poll_count} polls")
-            return
-        await asyncio.sleep(5)
-        cleanup_poll_count += 1
-
-
-def _log_cleanup_failure(cleanup_task: asyncio.Task[None], *, trace_id: str, task_id: str) -> None:
-    if cleanup_task.cancelled():
-        return
-
-    exc = cleanup_task.exception()
-    if exc is not None:
-        logger.error(f"[trace={trace_id}] Deferred cleanup failed for task {task_id}: {exc}")
-
-
-def _schedule_deferred_subagent_cleanup(task_id: str, trace_id: str, max_polls: int) -> None:
-    logger.debug(f"[trace={trace_id}] Scheduling deferred cleanup for cancelled task {task_id}")
-    cleanup_task = asyncio.create_task(_deferred_cleanup_subagent_task(task_id, trace_id, max_polls))
-    cleanup_task.add_done_callback(lambda task: _log_cleanup_failure(task, trace_id=trace_id, task_id=task_id))
-
-
-def _find_usage_recorder(runtime: Any) -> Any | None:
-    """Find a callback handler with ``record_external_llm_usage_records`` in the runtime config.
-
-    LangChain may pass ``config["callbacks"]`` in three different shapes:
-
-    - ``None`` (no callbacks registered): no recorder.
-    - A plain ``list[BaseCallbackHandler]``: iterate it directly.
-    - A ``BaseCallbackManager`` instance (e.g. ``AsyncCallbackManager`` on async
-      tool runs): managers are not iterable, so we unwrap ``.handlers`` first.
-
-    Any other shape (e.g. a single handler object accidentally passed without a
-    list wrapper) cannot be iterated safely; treat it as "no recorder" rather
-    than raise.
-    """
-    if runtime is None:
-        return None
-    config = getattr(runtime, "config", None)
-    if not isinstance(config, dict):
-        return None
-    callbacks = config.get("callbacks")
-    if isinstance(callbacks, BaseCallbackManager):
-        callbacks = callbacks.handlers
-    if not callbacks:
-        return None
-    if not isinstance(callbacks, list):
-        return None
-    for cb in callbacks:
-        if hasattr(cb, "record_external_llm_usage_records"):
-            return cb
-    return None
-
-
-def _summarize_usage(records: list[dict] | None) -> dict | None:
-    """Summarize token usage records into a compact dict for SSE events."""
-    if not records:
-        return None
-    return {
-        "input_tokens": sum(r.get("input_tokens", 0) or 0 for r in records),
-        "output_tokens": sum(r.get("output_tokens", 0) or 0 for r in records),
-        "total_tokens": sum(r.get("total_tokens", 0) or 0 for r in records),
-    }
-
-
-def _report_subagent_usage(runtime: Any, result: Any) -> None:
-    """Report subagent token usage to the parent RunJournal, if available.
-
-    Each subagent task must be reported only once (guarded by usage_reported).
-    """
-    if getattr(result, "usage_reported", True):
-        return
-    records = getattr(result, "token_usage_records", None) or []
-    if not records:
-        return
-    journal = _find_usage_recorder(runtime)
-    if journal is None:
-        logger.debug("No usage recorder found in runtime callbacks — subagent token usage not recorded")
-        return
-    try:
-        journal.record_external_llm_usage_records(records)
-        result.usage_reported = True
-    except Exception:
-        logger.warning("Failed to report subagent token usage", exc_info=True)
-
 
 def _get_runtime_app_config(runtime: Any) -> "AppConfig | None":
     context = getattr(runtime, "context", None)
@@ -227,7 +91,6 @@ async def task_tool(
         subagent_type: The type of subagent to use. ALWAYS PROVIDE THIS PARAMETER THIRD.
     """
     runtime_app_config = _get_runtime_app_config(runtime)
-    cache_token_usage = _token_usage_cache_enabled(runtime_app_config)
     available_subagent_names = get_available_subagent_names(app_config=runtime_app_config) if runtime_app_config is not None else get_available_subagent_names()
 
     # Get subagent configuration
@@ -363,32 +226,23 @@ async def task_tool(
                 last_message_count = current_message_count
 
             # Check if task completed, failed, or timed out
-            usage = _summarize_usage(getattr(result, "token_usage_records", None))
             if result.status == SubagentStatus.COMPLETED:
-                _cache_subagent_usage(tool_call_id, usage, enabled=cache_token_usage)
+                writer({"type": "task_completed", "task_id": task_id, "result": result.result})
-                _report_subagent_usage(runtime, result)
-                writer({"type": "task_completed", "task_id": task_id, "result": result.result, "usage": usage})
                 logger.info(f"[trace={trace_id}] Task {task_id} completed after {poll_count} polls")
                 cleanup_background_task(task_id)
                 return f"Task Succeeded. Result: {result.result}"
             elif result.status == SubagentStatus.FAILED:
-                _cache_subagent_usage(tool_call_id, usage, enabled=cache_token_usage)
+                writer({"type": "task_failed", "task_id": task_id, "error": result.error})
-                _report_subagent_usage(runtime, result)
-                writer({"type": "task_failed", "task_id": task_id, "error": result.error, "usage": usage})
                 logger.error(f"[trace={trace_id}] Task {task_id} failed: {result.error}")
                 cleanup_background_task(task_id)
                 return f"Task failed. Error: {result.error}"
             elif result.status == SubagentStatus.CANCELLED:
-                _cache_subagent_usage(tool_call_id, usage, enabled=cache_token_usage)
+                writer({"type": "task_cancelled", "task_id": task_id, "error": result.error})
-                _report_subagent_usage(runtime, result)
-                writer({"type": "task_cancelled", "task_id": task_id, "error": result.error, "usage": usage})
                 logger.info(f"[trace={trace_id}] Task {task_id} cancelled: {result.error}")
                 cleanup_background_task(task_id)
                 return "Task cancelled by user."
             elif result.status == SubagentStatus.TIMED_OUT:
-                _cache_subagent_usage(tool_call_id, usage, enabled=cache_token_usage)
+                writer({"type": "task_timed_out", "task_id": task_id, "error": result.error})
-                _report_subagent_usage(runtime, result)
-                writer({"type": "task_timed_out", "task_id": task_id, "error": result.error, "usage": usage})
                 logger.warning(f"[trace={trace_id}] Task {task_id} timed out: {result.error}")
                 cleanup_background_task(task_id)
                 return f"Task timed out. Error: {result.error}"
@@ -400,42 +254,49 @@ async def task_tool(
             # Polling timeout as a safety net (in case thread pool timeout doesn't work)
             # Set to execution timeout + 60s buffer, in 5s poll intervals
             # This catches edge cases where the background task gets stuck
+            # Note: We don't call cleanup_background_task here because the task may
+            # still be running in the background. The cleanup will happen when the
+            # executor completes and sets a terminal status.
             if poll_count > max_poll_count:
                 timeout_minutes = config.timeout_seconds // 60
                 logger.error(f"[trace={trace_id}] Task {task_id} polling timed out after {poll_count} polls (should have been caught by thread pool timeout)")
-                _report_subagent_usage(runtime, result)
+                writer({"type": "task_timed_out", "task_id": task_id})
-                usage = _summarize_usage(getattr(result, "token_usage_records", None))
-                _cache_subagent_usage(tool_call_id, usage, enabled=cache_token_usage)
-                writer({"type": "task_timed_out", "task_id": task_id, "usage": usage})
-                # The task may still be running in the background. Signal cooperative
-                # cancellation and schedule deferred cleanup to remove the entry from
-                # _background_tasks once the background thread reaches a terminal state.
-                request_cancel_background_task(task_id)
-                _schedule_deferred_subagent_cleanup(task_id, trace_id, max_poll_count)
                 return f"Task polling timed out after {timeout_minutes} minutes. This may indicate the background task is stuck. Status: {result.status.value}"
     except asyncio.CancelledError:
         # Signal the background subagent thread to stop cooperatively.
+        # Without this, the thread (running in ThreadPoolExecutor with its
+        # own event loop via asyncio.run) would continue executing even
+        # after the parent task is cancelled.
         request_cancel_background_task(task_id)
 
-        # Wait (shielded) for the subagent to reach a terminal state so the
+        async def cleanup_when_done() -> None:
-        # final token usage snapshot is reported to the parent RunJournal
+            max_cleanup_polls = max_poll_count
-        # before the parent worker persists get_completion_data().
+            cleanup_poll_count = 0
-        terminal_result = None
-        try:
-            terminal_result = await asyncio.shield(_await_subagent_terminal(task_id, max_poll_count))
-        except asyncio.CancelledError:
-            pass
 
-        # Report whatever the subagent collected (even if we timed out).
+            while True:
-        final_result = terminal_result or get_background_task_result(task_id)
+                result = get_background_task_result(task_id)
-        if final_result is not None:
+                if result is None:
-            _report_subagent_usage(runtime, final_result)
+                    return
-        if final_result is not None and _is_subagent_terminal(final_result):
+
+                if result.status in {SubagentStatus.COMPLETED, SubagentStatus.FAILED, SubagentStatus.CANCELLED, SubagentStatus.TIMED_OUT} or getattr(result, "completed_at", None) is not None:
                     cleanup_background_task(task_id)
-        else:
+                    return
-            _schedule_deferred_subagent_cleanup(task_id, trace_id, max_poll_count)
+
-        _subagent_usage_cache.pop(tool_call_id, None)
+                if cleanup_poll_count > max_cleanup_polls:
-        raise
+                    logger.warning(f"[trace={trace_id}] Deferred cleanup for task {task_id} timed out after {cleanup_poll_count} polls")
-    except Exception:
+                    return
-        _subagent_usage_cache.pop(tool_call_id, None)
+
+                await asyncio.sleep(5)
+                cleanup_poll_count += 1
+
+        def log_cleanup_failure(cleanup_task: asyncio.Task[None]) -> None:
+            if cleanup_task.cancelled():
+                return
+
+            exc = cleanup_task.exception()
+            if exc is not None:
+                logger.error(f"[trace={trace_id}] Deferred cleanup failed for task {task_id}: {exc}")
+
+        logger.debug(f"[trace={trace_id}] Scheduling deferred cleanup for cancelled task {task_id}")
+        asyncio.create_task(cleanup_when_done()).add_done_callback(log_cleanup_failure)
         raise

backend/packages/harness/deerflow/tools/builtins/update_agent_tool.py

@@ -27,7 +27,7 @@ from langgraph.types import Command
 from deerflow.config.agents_config import load_agent_config, validate_agent_name
 from deerflow.config.app_config import get_app_config
 from deerflow.config.paths import get_paths
-from deerflow.runtime.user_context import resolve_runtime_user_id
+from deerflow.runtime.user_context import get_effective_user_id
 from deerflow.tools.types import Runtime
 
 logger = logging.getLogger(__name__)
@@ -67,7 +67,7 @@ def _cleanup_temps(temps: list[Path]) -> None:
             logger.debug("Failed to clean up temp file %s", tmp, exc_info=True)
 
 
-@tool(parse_docstring=True)
+@tool
 def update_agent(
     runtime: Runtime,
     soul: str | None = None,
@@ -118,13 +118,9 @@ def update_agent(
         return _err("update_agent is only available inside a custom agent's chat. There is no agent_name in the current runtime context, so there is nothing to update. If you are inside the bootstrap flow, use setup_agent instead.")
 
     # Resolve the active user so that updates only affect this user's agent.
-    # ``resolve_runtime_user_id`` prefers ``runtime.context["user_id"]`` (set by
+    # ``get_effective_user_id`` returns DEFAULT_USER_ID when no auth context
-    # the gateway from the auth-validated request) and falls back to the
+    # is set (matching how memory and thread storage behave).
-    # contextvar, then DEFAULT_USER_ID. This matches setup_agent so a user
+    user_id = get_effective_user_id()
-    # creating an agent and later refining it always touches the same files,
-    # even if the contextvar gets lost across an async/thread boundary
-    # (issue #2782 / #2862 class of bugs).
-    user_id = resolve_runtime_user_id(runtime)
 
     # Reject an unknown ``model`` *before* touching the filesystem. Otherwise
     # ``_resolve_model_name`` silently falls back to the default at runtime

backend/packages/harness/deerflow/tools/skill_manage_tool.py

@@ -10,11 +10,11 @@ from weakref import WeakValueDictionary
 from langchain.tools import tool
 
 from deerflow.agents.lead_agent.prompt import refresh_skills_system_prompt_cache_async
+from deerflow.mcp.tools import _make_sync_tool_wrapper
 from deerflow.skills.security_scanner import scan_skill_content
 from deerflow.skills.storage import get_or_new_skill_storage
 from deerflow.skills.storage.skill_storage import SkillStorage
 from deerflow.skills.types import SKILL_MD_FILE
-from deerflow.tools.sync import make_sync_tool_wrapper
 from deerflow.tools.types import Runtime
 
 logger = logging.getLogger(__name__)
@@ -235,4 +235,4 @@ async def skill_manage_tool(
     )
 
 
-skill_manage_tool.func = make_sync_tool_wrapper(_skill_manage_impl, "skill_manage")
+skill_manage_tool.func = _make_sync_tool_wrapper(_skill_manage_impl, "skill_manage")

backend/packages/harness/deerflow/tools/sync.py

@@ -1,92 +0,0 @@
-"""Utilities for invoking async tools from synchronous agent paths."""
-
-import asyncio
-import atexit
-import concurrent.futures
-import contextvars
-import functools
-import logging
-from collections.abc import Callable
-from typing import Any, get_type_hints
-
-from langchain_core.runnables import RunnableConfig
-
-logger = logging.getLogger(__name__)
-
-# Shared thread pool for sync tool invocation in async environments.
-_SYNC_TOOL_EXECUTOR = concurrent.futures.ThreadPoolExecutor(max_workers=10, thread_name_prefix="tool-sync")
-
-atexit.register(lambda: _SYNC_TOOL_EXECUTOR.shutdown(wait=False))
-
-
-def _get_runnable_config_param(func: Callable[..., Any]) -> str | None:
-    """Return the coroutine parameter that expects LangChain RunnableConfig."""
-    if isinstance(func, functools.partial):
-        func = func.func
-
-    try:
-        type_hints = get_type_hints(func)
-    except Exception:
-        return None
-
-    for name, type_ in type_hints.items():
-        if type_ is RunnableConfig:
-            return name
-    return None
-
-
-def make_sync_tool_wrapper(coro: Callable[..., Any], tool_name: str) -> Callable[..., Any]:
-    """Build a synchronous wrapper for an asynchronous tool coroutine.
-
-    Args:
-        coro: Async callable backing a LangChain tool.
-        tool_name: Tool name used in error logs.
-
-    Returns:
-        A sync callable suitable for ``BaseTool.func``.
-
-    Notes:
-        If ``coro`` declares a ``RunnableConfig`` parameter, this wrapper
-        exposes ``config: RunnableConfig`` so LangChain can inject runtime
-        config and then forwards it to the coroutine's detected config
-        parameter. This covers DeerFlow's current config-sensitive tools, such
-        as ``invoke_acp_agent``.
-
-        This wrapper intentionally does not synthesize a dynamic function
-        signature. A future async tool with a normal user-facing argument named
-        ``config`` and a separate ``RunnableConfig`` parameter named something
-        else, such as ``run_config``, may collide with LangChain's injected
-        ``config`` argument. Rename that user-facing field or extend this
-        helper before using that signature.
-    """
-    config_param = _get_runnable_config_param(coro)
-
-    def run_coroutine(*args: Any, **kwargs: Any) -> Any:
-        try:
-            loop = asyncio.get_running_loop()
-        except RuntimeError:
-            loop = None
-
-        try:
-            if loop is not None and loop.is_running():
-                context = contextvars.copy_context()
-                future = _SYNC_TOOL_EXECUTOR.submit(context.run, lambda: asyncio.run(coro(*args, **kwargs)))
-                return future.result()
-            return asyncio.run(coro(*args, **kwargs))
-        except Exception as e:
-            logger.error("Error invoking tool %r via sync wrapper: %s", tool_name, e, exc_info=True)
-            raise
-
-    if config_param:
-
-        def sync_wrapper(*args: Any, config: RunnableConfig = None, **kwargs: Any) -> Any:
-            if config is not None or config_param not in kwargs:
-                kwargs[config_param] = config
-            return run_coroutine(*args, **kwargs)
-
-        return sync_wrapper
-
-    def sync_wrapper(*args: Any, **kwargs: Any) -> Any:
-        return run_coroutine(*args, **kwargs)
-
-    return sync_wrapper

backend/packages/harness/deerflow/tools/tools.py

@@ -7,8 +7,7 @@ from deerflow.config.app_config import AppConfig
 from deerflow.reflection import resolve_variable
 from deerflow.sandbox.security import is_host_bash_allowed
 from deerflow.tools.builtins import ask_clarification_tool, present_file_tool, task_tool, view_image_tool
-from deerflow.tools.builtins.tool_search import get_deferred_registry
+from deerflow.tools.builtins.tool_search import reset_deferred_registry
-from deerflow.tools.sync import make_sync_tool_wrapper
 
 logger = logging.getLogger(__name__)
 
@@ -34,13 +33,6 @@ def _is_host_bash_tool(tool: object) -> bool:
     return False
 
 
-def _ensure_sync_invocable_tool(tool: BaseTool) -> BaseTool:
-    """Attach a sync wrapper to async-only tools used by sync agent callers."""
-    if getattr(tool, "func", None) is None and getattr(tool, "coroutine", None) is not None:
-        tool.func = make_sync_tool_wrapper(tool.coroutine, tool.name)
-    return tool
-
-
 def get_available_tools(
     groups: list[str] | None = None,
     include_mcp: bool = True,
@@ -85,7 +77,7 @@ def get_available_tools(
                 cfg.use,
             )
 
-    loaded_tools = [_ensure_sync_invocable_tool(t) for _, t in loaded_tools_raw]
+    loaded_tools = [t for _, t in loaded_tools_raw]
 
     # Conditionally add tools based on config
     builtin_tools = BUILTIN_TOOLS.copy()
@@ -116,6 +108,8 @@ def get_available_tools(
     # made through the Gateway API (which runs in a separate process) are immediately
     # reflected when loading MCP tools.
     mcp_tools = []
+    # Reset deferred registry upfront to prevent stale state from previous calls
+    reset_deferred_registry()
     if include_mcp:
         try:
             from deerflow.config.extensions_config import ExtensionsConfig
@@ -133,51 +127,12 @@ def get_available_tools(
                         from deerflow.tools.builtins.tool_search import DeferredToolRegistry, set_deferred_registry
                         from deerflow.tools.builtins.tool_search import tool_search as tool_search_tool
 
-                        # Reuse the existing registry if one is already set for
-                        # this async context. ``get_available_tools`` is
-                        # re-entered whenever a subagent is spawned
-                        # (``task_tool`` calls it to build the child agent's
-                        # toolset), and previously we used to unconditionally
-                        # rebuild the registry — wiping out the parent agent's
-                        # tool_search promotions. The
-                        # ``DeferredToolFilterMiddleware`` then re-hid those
-                        # tools from subsequent model calls, leaving the agent
-                        # able to see a tool's name but unable to invoke it
-                        # (issue #2884). ``contextvars`` already gives us the
-                        # lifetime semantics we want: a fresh request / graph
-                        # run starts in a new asyncio task with the
-                        # ContextVar at its default of ``None``, so reuse is
-                        # only triggered for re-entrant calls inside one run.
-                        #
-                        # Intentionally NOT reconciling against the current
-                        # ``mcp_tools`` snapshot. The MCP cache only refreshes
-                        # on ``extensions_config.json`` mtime changes, which
-                        # in practice happens between graph runs — not inside
-                        # one. And even if a refresh did happen mid-run, the
-                        # already-built lead agent's ``ToolNode`` still holds
-                        # the *previous* tool set (LangGraph binds tools at
-                        # graph construction time), so a brand-new MCP tool
-                        # couldn't actually be invoked anyway. The
-                        # ``DeferredToolRegistry`` doesn't retain the names
-                        # of previously-promoted tools (``promote()`` drops
-                        # the entry entirely), so re-syncing the registry
-                        # against a fresh ``mcp_tools`` list would
-                        # mis-classify those promotions as new tools and
-                        # re-register them as deferred — exactly the bug
-                        # this fix exists to prevent.
-                        existing_registry = get_deferred_registry()
-                        if existing_registry is None:
                         registry = DeferredToolRegistry()
                         for t in mcp_tools:
                             registry.register(t)
                         set_deferred_registry(registry)
-                            logger.info(f"Tool search active: {len(mcp_tools)} tools deferred")
-                        else:
-                            mcp_tool_names = {t.name for t in mcp_tools}
-                            still_deferred = len(existing_registry)
-                            promoted_count = max(0, len(mcp_tool_names) - still_deferred)
-                            logger.info(f"Tool search active (preserved promotions): {still_deferred} tools deferred, {promoted_count} already promoted")
                         builtin_tools.append(tool_search_tool)
+                        logger.info(f"Tool search active: {len(mcp_tools)} tools deferred")
         except ImportError:
             logger.warning("MCP module not available. Install 'langchain-mcp-adapters' package to enable MCP tools.")
         except Exception as e:
@@ -205,7 +160,7 @@ def get_available_tools(
     # Deduplicate by tool name — config-loaded tools take priority, followed by
     # built-ins, MCP tools, and ACP tools.  Duplicate names cause the LLM to
     # receive ambiguous or concatenated function schemas (issue #1803).
-    all_tools = [_ensure_sync_invocable_tool(t) for t in loaded_tools + builtin_tools + mcp_tools + acp_tools]
+    all_tools = loaded_tools + builtin_tools + mcp_tools + acp_tools
     seen_names: set[str] = set()
     unique_tools: list[BaseTool] = []
     for t in all_tools:

backend/packages/harness/deerflow/tracing/__init__.py

@@ -1,8 +1,3 @@
 from .factory import build_tracing_callbacks
-from .metadata import build_langfuse_trace_metadata, inject_langfuse_metadata
 
-__all__ = [
+__all__ = ["build_tracing_callbacks"]
-    "build_langfuse_trace_metadata",
-    "build_tracing_callbacks",
-    "inject_langfuse_metadata",
-]

backend/packages/harness/deerflow/tracing/metadata.py

@@ -1,105 +0,0 @@
-"""Langfuse trace-attribute metadata builders.
-
-The Langfuse v4 ``langchain.CallbackHandler`` lifts a fixed set of reserved
-keys from ``RunnableConfig.metadata`` onto the root trace:
-
-- ``langfuse_session_id`` → groups traces (LangGraph thread → Langfuse Session)
-- ``langfuse_user_id``    → trace user_id (powers the Users page)
-- ``langfuse_trace_name`` → human-readable trace name
-- ``langfuse_tags``       → trace tags
-
-See ``langfuse/langchain/CallbackHandler.py::_parse_langfuse_trace_attributes``
-and https://langfuse.com/docs/observability/features/sessions for the
-contract. Builders here exist so the gateway/run worker can inject the
-right metadata without leaking Langfuse internals into the call sites.
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from deerflow.config import get_enabled_tracing_providers
-
-# Lazy-imported below to avoid a circular import: ``deerflow.runtime`` eagerly
-# imports the run worker, which in turn needs ``deerflow.tracing``.
-_DEFAULT_TRACE_NAME = "lead-agent"
-
-
-def build_langfuse_trace_metadata(
-    *,
-    thread_id: str | None,
-    user_id: str | None = None,
-    assistant_id: str | None = None,
-    model_name: str | None = None,
-    environment: str | None = None,
-) -> dict[str, Any]:
-    """Return Langfuse trace-attribute metadata for ``RunnableConfig.metadata``.
-
-    Returns ``{}`` when Langfuse is not in the enabled tracing providers so
-    callers can unconditionally merge the result without affecting LangSmith
-    or other tracers.
-
-    Args:
-        thread_id: LangGraph thread id; mapped to ``langfuse_session_id``.
-        user_id: Effective user id; falls back to ``DEFAULT_USER_ID`` when
-            ``None`` so the Langfuse Users page works in no-auth mode.
-        assistant_id: Optional agent identifier; defaults to ``"lead-agent"``.
-        model_name: Model name; emitted as ``model:<name>`` in ``langfuse_tags``.
-        environment: Deployment env (e.g. ``"production"``); emitted as
-            ``env:<value>`` in ``langfuse_tags``.
-    """
-    if "langfuse" not in get_enabled_tracing_providers():
-        return {}
-
-    from deerflow.runtime.user_context import DEFAULT_USER_ID
-
-    metadata: dict[str, Any] = {
-        "langfuse_session_id": thread_id,
-        "langfuse_user_id": user_id or DEFAULT_USER_ID,
-        "langfuse_trace_name": assistant_id or _DEFAULT_TRACE_NAME,
-    }
-
-    tags: list[str] = []
-    if environment:
-        tags.append(f"env:{environment}")
-    if model_name:
-        tags.append(f"model:{model_name}")
-    if tags:
-        metadata["langfuse_tags"] = tags
-
-    return metadata
-
-
-def inject_langfuse_metadata(
-    config: dict,
-    *,
-    thread_id: str | None,
-    user_id: str | None = None,
-    assistant_id: str | None = None,
-    model_name: str | None = None,
-    environment: str | None = None,
-) -> None:
-    """Merge Langfuse trace-attribute metadata into ``config["metadata"]``.
-
-    Shared by the gateway worker (``runtime/runs/worker.py``) and the
-    embedded client (``client.py``) so the two paths cannot drift apart.
-
-    Caller-supplied metadata wins via ``setdefault`` — an upstream value
-    for e.g. ``langfuse_session_id`` set by the frontend stays untouched.
-    The ``config`` dict is mutated in place; the call is a no-op when
-    Langfuse is not in the enabled tracing providers.
-    """
-    langfuse_metadata = build_langfuse_trace_metadata(
-        thread_id=thread_id,
-        user_id=user_id,
-        assistant_id=assistant_id,
-        model_name=model_name,
-        environment=environment,
-    )
-    if not langfuse_metadata:
-        return
-
-    merged_metadata = dict(config.get("metadata") or {})
-    for key, value in langfuse_metadata.items():
-        merged_metadata.setdefault(key, value)
-    config["metadata"] = merged_metadata

backend/pyproject.toml

@@ -25,7 +25,6 @@ dependencies = [
 
 [project.optional-dependencies]
 postgres = ["deerflow-harness[postgres]"]
-discord = ["discord.py>=2.7.0"]
 
 [dependency-groups]
 dev = [

backend/tests/_agent_e2e_helpers.py

@@ -1,68 +0,0 @@
-"""Shared helpers for user-isolation e2e tests on the custom-agent tooling.
-
-Centralises the small fake-LLM shim and a few test-data builders that the
-three e2e files in this PR (``test_setup_agent_e2e_user_isolation``,
-``test_update_agent_e2e_user_isolation``, ``test_setup_agent_http_e2e_real_server``)
-all need. The shim is what lets a real ``langchain.agents.create_agent``
-graph run without an API key — every other layer in those tests is real
-production code, which is the entire point of the test design.
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from langchain_core.language_models.fake_chat_models import FakeMessagesListChatModel
-from langchain_core.messages import AIMessage
-from langchain_core.runnables import Runnable
-
-
-class FakeToolCallingModel(FakeMessagesListChatModel):
-    """FakeMessagesListChatModel plus a no-op ``bind_tools`` for create_agent.
-
-    ``langchain.agents.create_agent`` calls ``model.bind_tools(...)`` to
-    expose the tool schemas to the model; the upstream fake raises
-    ``NotImplementedError`` there. We just return ``self`` because we
-    drive deterministic tool_call output via ``responses=...``, no schema
-    handling needed.
-    """
-
-    def bind_tools(  # type: ignore[override]
-        self,
-        tools: Any,
-        *,
-        tool_choice: Any = None,
-        **kwargs: Any,
-    ) -> Runnable:
-        return self
-
-
-def build_single_tool_call_model(
-    *,
-    tool_name: str,
-    tool_args: dict[str, Any],
-    tool_call_id: str = "call_e2e_1",
-    final_text: str = "done",
-) -> FakeToolCallingModel:
-    """Build a fake model that emits exactly one tool_call then finishes.
-
-    Two-turn behaviour, identical across our e2e tests:
-      turn 1 → AIMessage with a single tool_call for *tool_name*
-      turn 2 → AIMessage with *final_text* (terminates the agent loop)
-    """
-    return FakeToolCallingModel(
-        responses=[
-            AIMessage(
-                content="",
-                tool_calls=[
-                    {
-                        "name": tool_name,
-                        "args": tool_args,
-                        "id": tool_call_id,
-                        "type": "tool_call",
-                    }
-                ],
-            ),
-            AIMessage(content=final_text),
-        ]
-    )

backend/tests/conftest.py

@@ -4,8 +4,6 @@ Sets up sys.path and pre-mocks modules that would cause circular import
 issues when unit-testing lightweight config/registry code in isolation.
 """
 
-from __future__ import annotations
-
 import importlib.util
 import sys
 from pathlib import Path
@@ -13,16 +11,11 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
-from support.detectors.blocking_io import BlockingIOProbe, detect_blocking_io
 
 # Make 'app' and 'deerflow' importable from any working directory
 sys.path.insert(0, str(Path(__file__).parent.parent))
 sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "scripts"))
 
-_BACKEND_ROOT = Path(__file__).resolve().parents[1]
-_blocking_io_probe = BlockingIOProbe(_BACKEND_ROOT)
-_BLOCKING_IO_DETECTOR_ATTR = "_blocking_io_detector"
-
 # Break the circular import chain that exists in production code:
 #   deerflow.subagents.__init__
 #     -> .executor (SubagentExecutor, SubagentResult)
@@ -63,92 +56,6 @@ def provisioner_module():
     return module
 
 
-@pytest.fixture()
-def blocking_io_detector():
-    """Fail a focused test if blocking calls run on the event loop thread."""
-    with detect_blocking_io(fail_on_exit=True) as detector:
-        yield detector
-
-
-def pytest_addoption(parser: pytest.Parser) -> None:
-    group = parser.getgroup("blocking-io")
-    group.addoption(
-        "--detect-blocking-io",
-        action="store_true",
-        default=False,
-        help="Collect blocking calls made while an asyncio event loop is running and report a summary.",
-    )
-    group.addoption(
-        "--detect-blocking-io-fail",
-        action="store_true",
-        default=False,
-        help="Set a failing exit status when --detect-blocking-io records violations.",
-    )
-
-
-def pytest_configure(config: pytest.Config) -> None:
-    config.addinivalue_line("markers", "no_blocking_io_probe: skip the optional blocking IO probe")
-
-
-def pytest_sessionstart(session: pytest.Session) -> None:
-    if _blocking_io_probe_enabled(session.config):
-        _blocking_io_probe.clear()
-
-
-@pytest.hookimpl(hookwrapper=True)
-def pytest_runtest_call(item: pytest.Item):
-    if not _blocking_io_probe_enabled(item.config) or _blocking_io_probe_skipped(item):
-        yield
-        return
-
-    detector = detect_blocking_io(fail_on_exit=False, stack_limit=18)
-    detector.__enter__()
-    setattr(item, _BLOCKING_IO_DETECTOR_ATTR, detector)
-    yield
-
-
-@pytest.hookimpl(hookwrapper=True)
-def pytest_runtest_teardown(item: pytest.Item):
-    yield
-
-    detector = getattr(item, _BLOCKING_IO_DETECTOR_ATTR, None)
-    if detector is None:
-        return
-
-    try:
-        detector.__exit__(None, None, None)
-        _blocking_io_probe.record(item.nodeid, detector.violations)
-    finally:
-        delattr(item, _BLOCKING_IO_DETECTOR_ATTR)
-
-
-def pytest_sessionfinish(session: pytest.Session) -> None:
-    if _blocking_io_fail_enabled(session.config) and _blocking_io_probe.violation_count and session.exitstatus == pytest.ExitCode.OK:
-        session.exitstatus = pytest.ExitCode.TESTS_FAILED
-
-
-def pytest_terminal_summary(terminalreporter: pytest.TerminalReporter) -> None:
-    if not _blocking_io_probe_enabled(terminalreporter.config):
-        return
-
-    header, *details = _blocking_io_probe.format_summary().splitlines()
-    terminalreporter.write_sep("=", header)
-    for line in details:
-        terminalreporter.write_line(line)
-
-
-def _blocking_io_probe_enabled(config: pytest.Config) -> bool:
-    return bool(config.getoption("--detect-blocking-io") or config.getoption("--detect-blocking-io-fail"))
-
-
-def _blocking_io_fail_enabled(config: pytest.Config) -> bool:
-    return bool(config.getoption("--detect-blocking-io-fail"))
-
-
-def _blocking_io_probe_skipped(item: pytest.Item) -> bool:
-    return item.path.name == "test_blocking_io_detector.py" or item.get_closest_marker("no_blocking_io_probe") is not None
-
-
 # ---------------------------------------------------------------------------
 # Auto-set user context for every test unless marked no_auto_user
 # ---------------------------------------------------------------------------
@@ -176,31 +83,6 @@ def _reset_skill_storage_singleton():
         reset_skill_storage()
 
 
-@pytest.fixture(autouse=True)
-def _restore_title_config_singleton():
-    """Reset ``_title_config`` to its pristine default after every test.
-
-    ``AppConfig.from_file()`` writes the on-disk ``title`` block into the
-    module-level singleton (``config/app_config.py`` calls
-    ``load_title_config_from_dict``). Any test that loads the real
-    ``config.yaml`` therefore leaves the singleton in a state that
-    ``test_title_middleware_core_logic.py`` does not expect; that suite
-    relies on the pristine ``TitleConfig()`` default (``enabled=True``).
-    We restore the default after every test so test files stay
-    independent regardless of order.
-    """
-    try:
-        from deerflow.config.title_config import reset_title_config
-    except ImportError:
-        yield
-        return
-
-    try:
-        yield
-    finally:
-        reset_title_config()
-
-
 @pytest.fixture(autouse=True)
 def _auto_user_context(request):
     """Inject a default ``test-user-autouse`` into the contextvar.

backend/tests/support/__init__.py

@@ -1 +0,0 @@
-"""Shared test support helpers."""

backend/tests/support/detectors/__init__.py

@@ -1 +0,0 @@
-"""Runtime and static detectors used by tests."""

backend/tests/support/detectors/blocking_io.py

@@ -1,287 +0,0 @@
-"""Test helper for detecting blocking calls on an asyncio event loop.
-
-The detector is intentionally test-only. It monkeypatches a small set of
-well-known blocking entry points and their already-loaded module-level aliases,
-then records calls only when they happen on a thread that is currently running
-an asyncio event loop. Aliases captured in closures or default arguments remain
-out of scope.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import importlib
-import sys
-import traceback
-from collections import Counter
-from collections.abc import Callable, Iterable, Iterator
-from contextlib import AbstractContextManager
-from dataclasses import dataclass
-from functools import wraps
-from pathlib import Path
-from types import TracebackType
-from typing import Any
-
-BlockingCallable = Callable[..., Any]
-
-
-@dataclass(frozen=True)
-class BlockingCallSpec:
-    """Describes one blocking callable to wrap during a detector run."""
-
-    name: str
-    target: str
-    record_on_iteration: bool = False
-
-
-@dataclass(frozen=True)
-class BlockingCall:
-    """One blocking call observed on an asyncio event loop thread."""
-
-    name: str
-    target: str
-    stack: tuple[traceback.FrameSummary, ...]
-
-
-DEFAULT_BLOCKING_CALL_SPECS: tuple[BlockingCallSpec, ...] = (
-    BlockingCallSpec("time.sleep", "time:sleep"),
-    BlockingCallSpec("requests.Session.request", "requests.sessions:Session.request"),
-    BlockingCallSpec("httpx.Client.request", "httpx:Client.request"),
-    BlockingCallSpec("os.walk", "os:walk", record_on_iteration=True),
-    BlockingCallSpec("pathlib.Path.resolve", "pathlib:Path.resolve"),
-    BlockingCallSpec("pathlib.Path.read_text", "pathlib:Path.read_text"),
-    BlockingCallSpec("pathlib.Path.write_text", "pathlib:Path.write_text"),
-)
-
-
-def _is_event_loop_thread() -> bool:
-    try:
-        loop = asyncio.get_running_loop()
-    except RuntimeError:
-        return False
-    return loop.is_running()
-
-
-def _resolve_target(target: str) -> tuple[object, str, BlockingCallable]:
-    module_name, attr_path = target.split(":", maxsplit=1)
-    owner: object = importlib.import_module(module_name)
-    parts = attr_path.split(".")
-    for part in parts[:-1]:
-        owner = getattr(owner, part)
-
-    attr_name = parts[-1]
-    original = getattr(owner, attr_name)
-    return owner, attr_name, original
-
-
-def _trim_detector_frames(stack: Iterable[traceback.FrameSummary]) -> tuple[traceback.FrameSummary, ...]:
-    return tuple(frame for frame in stack if frame.filename != __file__)
-
-
-class BlockingIODetector(AbstractContextManager["BlockingIODetector"]):
-    """Record blocking calls made from async runtime code.
-
-    By default the detector reports violations but does not fail on context
-    exit. Tests can set ``fail_on_exit=True`` or call
-    ``assert_no_blocking_calls()`` explicitly.
-    """
-
-    def __init__(
-        self,
-        specs: Iterable[BlockingCallSpec] = DEFAULT_BLOCKING_CALL_SPECS,
-        *,
-        fail_on_exit: bool = False,
-        patch_loaded_aliases: bool = True,
-        stack_limit: int = 12,
-    ) -> None:
-        self._specs = tuple(specs)
-        self._fail_on_exit = fail_on_exit
-        self._patch_loaded_aliases_enabled = patch_loaded_aliases
-        self._stack_limit = stack_limit
-        self._patches: list[tuple[object, str, BlockingCallable]] = []
-        self._patch_keys: set[tuple[int, str]] = set()
-        self.violations: list[BlockingCall] = []
-        self._active = False
-
-    def __enter__(self) -> BlockingIODetector:
-        try:
-            self._active = True
-            alias_replacements: dict[int, BlockingCallable] = {}
-            for spec in self._specs:
-                owner, attr_name, original = _resolve_target(spec.target)
-                wrapper = self._wrap(spec, original)
-                self._patch_attribute(owner, attr_name, original, wrapper)
-                alias_replacements[id(original)] = wrapper
-
-            if self._patch_loaded_aliases_enabled:
-                self._patch_loaded_module_aliases(alias_replacements)
-        except Exception:
-            self._restore()
-            self._active = False
-            raise
-        return self
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_value: BaseException | None,
-        traceback_value: TracebackType | None,
-    ) -> bool | None:
-        self._restore()
-        self._active = False
-        if exc_type is None and self._fail_on_exit:
-            self.assert_no_blocking_calls()
-        return None
-
-    def _restore(self) -> None:
-        for owner, attr_name, original in reversed(self._patches):
-            setattr(owner, attr_name, original)
-        self._patches.clear()
-        self._patch_keys.clear()
-
-    def _patch_attribute(self, owner: object, attr_name: str, original: BlockingCallable, replacement: BlockingCallable) -> None:
-        key = (id(owner), attr_name)
-        if key in self._patch_keys:
-            return
-        setattr(owner, attr_name, replacement)
-        self._patches.append((owner, attr_name, original))
-        self._patch_keys.add(key)
-
-    def _patch_loaded_module_aliases(self, replacements_by_id: dict[int, BlockingCallable]) -> None:
-        for module in tuple(sys.modules.values()):
-            namespace = getattr(module, "__dict__", None)
-            if not isinstance(namespace, dict):
-                continue
-
-            for attr_name, value in tuple(namespace.items()):
-                replacement = replacements_by_id.get(id(value))
-                if replacement is not None:
-                    self._patch_attribute(module, attr_name, value, replacement)
-
-    def _wrap(self, spec: BlockingCallSpec, original: BlockingCallable) -> BlockingCallable:
-        @wraps(original)
-        def wrapper(*args: Any, **kwargs: Any) -> Any:
-            if spec.record_on_iteration:
-                result = original(*args, **kwargs)
-                return self._wrap_iteration(spec, result)
-            self._record_if_blocking(spec)
-            return original(*args, **kwargs)
-
-        return wrapper
-
-    def _wrap_iteration(self, spec: BlockingCallSpec, iterable: Iterable[Any]) -> Iterator[Any]:
-        iterator = iter(iterable)
-        reported = False
-
-        while True:
-            if not reported:
-                reported = self._record_if_blocking(spec)
-            try:
-                yield next(iterator)
-            except StopIteration:
-                return
-
-    def _record_if_blocking(self, spec: BlockingCallSpec) -> bool:
-        if self._active and _is_event_loop_thread():
-            stack = _trim_detector_frames(traceback.extract_stack(limit=self._stack_limit))
-            self.violations.append(BlockingCall(spec.name, spec.target, stack))
-            return True
-        return False
-
-    def assert_no_blocking_calls(self) -> None:
-        if self.violations:
-            raise AssertionError(format_blocking_calls(self.violations))
-
-
-class BlockingIOProbe:
-    """Collect detector output across tests and format a compact summary."""
-
-    def __init__(self, project_root: Path) -> None:
-        self._project_root = project_root.resolve()
-        self._observed: list[tuple[str, BlockingCall]] = []
-
-    @property
-    def violation_count(self) -> int:
-        return len(self._observed)
-
-    @property
-    def test_count(self) -> int:
-        return len({nodeid for nodeid, _violation in self._observed})
-
-    def clear(self) -> None:
-        self._observed.clear()
-
-    def record(self, nodeid: str, violations: Iterable[BlockingCall]) -> None:
-        for violation in violations:
-            self._observed.append((nodeid, violation))
-
-    def format_summary(self, *, limit: int = 30) -> str:
-        if not self._observed:
-            return "blocking io probe: no violations"
-
-        call_sites: Counter[tuple[str, str, int, str, str]] = Counter()
-        for _nodeid, violation in self._observed:
-            frame = self._local_call_site(violation.stack)
-            if frame is None:
-                call_sites[(violation.name, "<unknown>", 0, "<unknown>", "")] += 1
-                continue
-
-            call_sites[
-                (
-                    violation.name,
-                    self._relative(frame.filename),
-                    frame.lineno,
-                    frame.name,
-                    (frame.line or "").strip(),
-                )
-            ] += 1
-
-        lines = [f"blocking io probe: {self.violation_count} violations across {self.test_count} tests", "Top call sites:"]
-        for (name, filename, lineno, function, line), count in call_sites.most_common(limit):
-            lines.append(f"{count:4d} {name} {filename}:{lineno} {function} | {line}")
-        return "\n".join(lines)
-
-    def _relative(self, filename: str) -> str:
-        try:
-            return str(Path(filename).resolve().relative_to(self._project_root))
-        except ValueError:
-            return filename
-
-    def _local_call_site(self, stack: tuple[traceback.FrameSummary, ...]) -> traceback.FrameSummary | None:
-        local_frames = [frame for frame in stack if str(self._project_root) in frame.filename and "/.venv/" not in frame.filename and not self._relative(frame.filename).startswith("tests/")]
-        if local_frames:
-            return local_frames[-1]
-
-        test_frames = [frame for frame in stack if str(self._project_root) in frame.filename and "/.venv/" not in frame.filename]
-        return test_frames[-1] if test_frames else None
-
-
-def detect_blocking_io(
-    specs: Iterable[BlockingCallSpec] = DEFAULT_BLOCKING_CALL_SPECS,
-    *,
-    fail_on_exit: bool = False,
-    patch_loaded_aliases: bool = True,
-    stack_limit: int = 12,
-) -> BlockingIODetector:
-    """Create a detector context manager for a focused test scope."""
-
-    return BlockingIODetector(specs, fail_on_exit=fail_on_exit, patch_loaded_aliases=patch_loaded_aliases, stack_limit=stack_limit)
-
-
-def format_blocking_calls(violations: Iterable[BlockingCall]) -> str:
-    """Format detector output with enough stack context to locate call sites."""
-
-    lines = ["Blocking calls were executed on an asyncio event loop thread:"]
-    for index, violation in enumerate(violations, start=1):
-        lines.append(f"{index}. {violation.name} ({violation.target})")
-        lines.extend(_format_stack(violation.stack))
-    return "\n".join(lines)
-
-
-def _format_stack(stack: Iterable[traceback.FrameSummary]) -> Iterator[str]:
-    for frame in stack:
-        location = f"{frame.filename}:{frame.lineno}"
-        lines = [f"   at {frame.name} ({location})"]
-        if frame.line:
-            lines.append(f"      {frame.line.strip()}")
-        yield from lines

backend/tests/support/detectors/thread_boundaries.py

@@ -1,507 +0,0 @@
-#!/usr/bin/env python3
-"""Inventory async/thread boundary points for developer review.
-
-This detector is intentionally non-invasive: it parses Python source with AST
-and reports places where code crosses sync/async/thread boundaries. Findings
-are review evidence, not automatic bug decisions.
-"""
-
-from __future__ import annotations
-
-import argparse
-import ast
-import json
-import os
-import sys
-from collections.abc import Iterable, Sequence
-from dataclasses import asdict, dataclass
-from pathlib import Path
-
-REPO_ROOT = Path(__file__).resolve().parents[4]
-DEFAULT_SCAN_PATHS = (
-    REPO_ROOT / "backend" / "app",
-    REPO_ROOT / "backend" / "packages" / "harness" / "deerflow",
-)
-IGNORED_DIR_NAMES = {
-    ".git",
-    ".mypy_cache",
-    ".pytest_cache",
-    ".ruff_cache",
-    ".venv",
-    "__pycache__",
-    "node_modules",
-}
-SEVERITY_ORDER = {"INFO": 0, "WARN": 1, "FAIL": 2}
-
-
-@dataclass(frozen=True)
-class BoundaryFinding:
-    severity: str
-    category: str
-    path: str
-    line: int
-    column: int
-    function: str
-    async_context: bool
-    symbol: str
-    message: str
-    code: str
-
-    def to_dict(self) -> dict[str, object]:
-        return asdict(self)
-
-
-@dataclass(frozen=True)
-class _FunctionContext:
-    name: str
-    is_async: bool
-
-
-@dataclass(frozen=True)
-class _CallRule:
-    severity: str
-    category: str
-    message: str
-
-
-EXACT_CALL_RULES: dict[str, _CallRule] = {
-    "asyncio.run": _CallRule(
-        "WARN",
-        "SYNC_ASYNC_BRIDGE",
-        "Runs a coroutine from synchronous code by creating an event loop boundary.",
-    ),
-    "asyncio.to_thread": _CallRule(
-        "INFO",
-        "ASYNC_THREAD_OFFLOAD",
-        "Offloads synchronous work from an async context into a worker thread.",
-    ),
-    "asyncio.new_event_loop": _CallRule(
-        "WARN",
-        "NEW_EVENT_LOOP",
-        "Creates a separate event loop; review resource ownership across loops.",
-    ),
-    "asyncio.run_coroutine_threadsafe": _CallRule(
-        "WARN",
-        "CROSS_THREAD_COROUTINE",
-        "Submits a coroutine to an event loop from another thread.",
-    ),
-    "concurrent.futures.ThreadPoolExecutor": _CallRule(
-        "INFO",
-        "THREAD_POOL",
-        "Creates a thread pool boundary.",
-    ),
-    "threading.Thread": _CallRule(
-        "INFO",
-        "RAW_THREAD",
-        "Creates a raw thread; ContextVar values do not propagate automatically.",
-    ),
-    "threading.Timer": _CallRule(
-        "INFO",
-        "RAW_TIMER_THREAD",
-        "Creates a timer-backed raw thread; ContextVar values do not propagate automatically.",
-    ),
-    "make_sync_tool_wrapper": _CallRule(
-        "INFO",
-        "SYNC_TOOL_WRAPPER",
-        "Adapts an async tool coroutine for synchronous tool invocation.",
-    ),
-}
-THREAD_POOL_CONSTRUCTORS = {"concurrent.futures.ThreadPoolExecutor"}
-ASYNC_TOOL_FACTORY_CALLS = {
-    "StructuredTool.from_function",
-    "langchain.tools.StructuredTool.from_function",
-    "langchain_core.tools.StructuredTool.from_function",
-}
-LANGCHAIN_INVOKE_RECEIVER_NAMES = {
-    "agent",
-    "chain",
-    "chat_model",
-    "graph",
-    "llm",
-    "model",
-    "runnable",
-}
-LANGCHAIN_INVOKE_RECEIVER_SUFFIXES = (
-    "_agent",
-    "_chain",
-    "_graph",
-    "_llm",
-    "_model",
-    "_runnable",
-)
-
-ASYNC_BLOCKING_CALL_RULES: dict[str, _CallRule] = {
-    "time.sleep": _CallRule(
-        "WARN",
-        "BLOCKING_CALL_IN_ASYNC",
-        "Blocks the event loop when called directly inside async code.",
-    ),
-    "subprocess.run": _CallRule(
-        "WARN",
-        "BLOCKING_SUBPROCESS_IN_ASYNC",
-        "Runs a blocking subprocess from async code.",
-    ),
-    "subprocess.check_call": _CallRule(
-        "WARN",
-        "BLOCKING_SUBPROCESS_IN_ASYNC",
-        "Runs a blocking subprocess from async code.",
-    ),
-    "subprocess.check_output": _CallRule(
-        "WARN",
-        "BLOCKING_SUBPROCESS_IN_ASYNC",
-        "Runs a blocking subprocess from async code.",
-    ),
-    "subprocess.Popen": _CallRule(
-        "WARN",
-        "BLOCKING_SUBPROCESS_IN_ASYNC",
-        "Starts a subprocess from async code; review whether it blocks later.",
-    ),
-}
-
-
-def dotted_name(node: ast.AST | None) -> str | None:
-    if isinstance(node, ast.Name):
-        return node.id
-    if isinstance(node, ast.Attribute):
-        parent = dotted_name(node.value)
-        if parent:
-            return f"{parent}.{node.attr}"
-        return node.attr
-    return None
-
-
-def call_receiver_name(node: ast.Call) -> str | None:
-    if not isinstance(node.func, ast.Attribute):
-        return None
-    return dotted_name(node.func.value)
-
-
-def is_none_node(node: ast.AST | None) -> bool:
-    return isinstance(node, ast.Constant) and node.value is None
-
-
-class BoundaryVisitor(ast.NodeVisitor):
-    def __init__(self, path: Path, relative_path: str, source_lines: Sequence[str]) -> None:
-        self.path = path
-        self.relative_path = relative_path
-        self.source_lines = source_lines
-        self.findings: list[BoundaryFinding] = []
-        self.function_stack: list[_FunctionContext] = []
-        self.import_aliases: dict[str, str] = {}
-        self.executor_names: set[str] = set()
-
-    @property
-    def current_function(self) -> str:
-        if not self.function_stack:
-            return "<module>"
-        return ".".join(context.name for context in self.function_stack)
-
-    @property
-    def in_async_context(self) -> bool:
-        return bool(self.function_stack and self.function_stack[-1].is_async)
-
-    def visit_Import(self, node: ast.Import) -> None:
-        for alias in node.names:
-            local_name = alias.asname or alias.name.split(".", 1)[0]
-            canonical_name = alias.name if alias.asname else local_name
-            self.import_aliases[local_name] = canonical_name
-
-    def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
-        if node.module is None:
-            return
-        for alias in node.names:
-            local_name = alias.asname or alias.name
-            self.import_aliases[local_name] = f"{node.module}.{alias.name}"
-
-    def visit_Assign(self, node: ast.Assign) -> None:
-        self._record_executor_targets(node.value, node.targets)
-        self.generic_visit(node)
-
-    def visit_AnnAssign(self, node: ast.AnnAssign) -> None:
-        if node.value is not None:
-            self._record_executor_targets(node.value, [node.target])
-        self.generic_visit(node)
-
-    def visit_With(self, node: ast.With) -> None:
-        for item in node.items:
-            if item.optional_vars is not None:
-                self._record_executor_targets(item.context_expr, [item.optional_vars])
-        self.generic_visit(node)
-
-    def visit_FunctionDef(self, node: ast.FunctionDef) -> None:
-        self.function_stack.append(_FunctionContext(node.name, is_async=False))
-        self.generic_visit(node)
-        self.function_stack.pop()
-
-    def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef) -> None:
-        self.function_stack.append(_FunctionContext(node.name, is_async=True))
-        try:
-            self._check_async_tool_definition(node)
-            self.generic_visit(node)
-        finally:
-            self.function_stack.pop()
-
-    def visit_Call(self, node: ast.Call) -> None:
-        call_name = self._canonical_name(dotted_name(node.func))
-        if call_name:
-            self._check_call(node, call_name)
-        self.generic_visit(node)
-
-    def _check_async_tool_definition(self, node: ast.AsyncFunctionDef) -> None:
-        for decorator in node.decorator_list:
-            decorator_call = decorator.func if isinstance(decorator, ast.Call) else decorator
-            decorator_name = self._canonical_name(dotted_name(decorator_call))
-            if decorator_name in {"langchain.tools.tool", "langchain_core.tools.tool"}:
-                self._emit(
-                    node,
-                    severity="INFO",
-                    category="ASYNC_TOOL_DEFINITION",
-                    symbol=decorator_name,
-                    message="Defines an async LangChain tool; sync clients need a wrapper before invoke().",
-                )
-                return
-
-    def _check_call(self, node: ast.Call, call_name: str) -> None:
-        rule = EXACT_CALL_RULES.get(call_name)
-        if rule:
-            self._emit_rule(node, call_name, rule)
-
-        if call_name.endswith(".run_until_complete"):
-            self._emit(
-                node,
-                severity="WARN",
-                category="RUN_UNTIL_COMPLETE",
-                symbol=call_name,
-                message="Drives an event loop from synchronous code; review nested-loop behavior.",
-            )
-
-        if self._is_executor_submit(node, call_name):
-            self._emit(
-                node,
-                severity="INFO",
-                category="EXECUTOR_SUBMIT",
-                symbol=call_name,
-                message="Submits work to an executor; review context propagation and cancellation.",
-            )
-
-        if call_name in ASYNC_TOOL_FACTORY_CALLS:
-            if any(keyword.arg == "coroutine" and not is_none_node(keyword.value) for keyword in node.keywords):
-                self._emit(
-                    node,
-                    severity="INFO",
-                    category="ASYNC_ONLY_TOOL_FACTORY",
-                    symbol=call_name,
-                    message="Creates a StructuredTool from a coroutine; sync clients need a wrapper.",
-                )
-
-        if self.in_async_context and call_name in ASYNC_BLOCKING_CALL_RULES:
-            self._emit_rule(node, call_name, ASYNC_BLOCKING_CALL_RULES[call_name])
-
-        if self.in_async_context and self._is_langchain_invoke(node, call_name, method_name="invoke"):
-            self._emit(
-                node,
-                severity="WARN",
-                category="SYNC_INVOKE_IN_ASYNC",
-                symbol=call_name,
-                message="Calls a synchronous invoke() from async code; review event-loop blocking.",
-            )
-
-        if not self.in_async_context and self._is_langchain_invoke(node, call_name, method_name="ainvoke"):
-            self._emit(
-                node,
-                severity="WARN",
-                category="ASYNC_INVOKE_IN_SYNC",
-                symbol=call_name,
-                message="Calls async ainvoke() from sync code; review how the coroutine is awaited.",
-            )
-
-    def _canonical_name(self, name: str | None) -> str | None:
-        if name is None:
-            return None
-        parts = name.split(".")
-        if parts and parts[0] in self.import_aliases:
-            return ".".join((self.import_aliases[parts[0]], *parts[1:]))
-        return name
-
-    def _record_executor_targets(self, value: ast.AST, targets: Sequence[ast.AST]) -> None:
-        if not isinstance(value, ast.Call):
-            return
-        call_name = self._canonical_name(dotted_name(value.func))
-        if call_name not in THREAD_POOL_CONSTRUCTORS:
-            return
-        for target in targets:
-            for name in self._target_names(target):
-                self.executor_names.add(name)
-
-    def _target_names(self, target: ast.AST) -> Iterable[str]:
-        if isinstance(target, ast.Name):
-            yield target.id
-        elif isinstance(target, (ast.Tuple, ast.List)):
-            for element in target.elts:
-                yield from self._target_names(element)
-
-    def _is_executor_submit(self, node: ast.Call, call_name: str) -> bool:
-        if not call_name.endswith(".submit"):
-            return False
-        receiver_name = call_receiver_name(node)
-        return receiver_name in self.executor_names
-
-    def _is_langchain_invoke(self, node: ast.Call, call_name: str, *, method_name: str) -> bool:
-        if not call_name.endswith(f".{method_name}"):
-            return False
-        receiver_name = call_receiver_name(node)
-        if receiver_name is None:
-            return False
-        receiver_leaf = receiver_name.rsplit(".", 1)[-1]
-        return receiver_leaf in LANGCHAIN_INVOKE_RECEIVER_NAMES or receiver_leaf.endswith(LANGCHAIN_INVOKE_RECEIVER_SUFFIXES)
-
-    def _emit_rule(self, node: ast.AST, symbol: str, rule: _CallRule) -> None:
-        self._emit(
-            node,
-            severity=rule.severity,
-            category=rule.category,
-            symbol=symbol,
-            message=rule.message,
-        )
-
-    def _emit(self, node: ast.AST, *, severity: str, category: str, symbol: str, message: str) -> None:
-        line = getattr(node, "lineno", 0)
-        column = getattr(node, "col_offset", 0)
-        code = ""
-        if line > 0 and line <= len(self.source_lines):
-            code = self.source_lines[line - 1].strip()
-        self.findings.append(
-            BoundaryFinding(
-                severity=severity,
-                category=category,
-                path=self.relative_path,
-                line=line,
-                column=column,
-                function=self.current_function,
-                async_context=self.in_async_context,
-                symbol=symbol,
-                message=message,
-                code=code,
-            )
-        )
-
-
-def relative_to_repo(path: Path, repo_root: Path = REPO_ROOT) -> str:
-    try:
-        return path.resolve().relative_to(repo_root.resolve()).as_posix()
-    except ValueError:
-        return path.as_posix()
-
-
-def scan_file(path: Path, *, repo_root: Path = REPO_ROOT) -> list[BoundaryFinding]:
-    source = path.read_text(encoding="utf-8")
-    source_lines = source.splitlines()
-    relative_path = relative_to_repo(path, repo_root)
-    try:
-        tree = ast.parse(source, filename=str(path))
-    except SyntaxError as exc:
-        line = exc.lineno or 0
-        code = source_lines[line - 1].strip() if line > 0 and line <= len(source_lines) else ""
-        return [
-            BoundaryFinding(
-                severity="WARN",
-                category="PARSE_ERROR",
-                path=relative_path,
-                line=line,
-                column=max((exc.offset or 1) - 1, 0),
-                function="<module>",
-                async_context=False,
-                symbol="SyntaxError",
-                message=str(exc),
-                code=code,
-            )
-        ]
-
-    visitor = BoundaryVisitor(path, relative_path, source_lines)
-    visitor.visit(tree)
-    return visitor.findings
-
-
-def is_ignored_path(path: Path) -> bool:
-    return any(part in IGNORED_DIR_NAMES for part in path.parts)
-
-
-def iter_python_files(paths: Iterable[Path]) -> Iterable[Path]:
-    for path in paths:
-        if not path.exists() or is_ignored_path(path):
-            continue
-        if path.is_file():
-            if path.suffix == ".py" and not is_ignored_path(path):
-                yield path
-            continue
-        for dirpath, dirnames, filenames in os.walk(path):
-            dirnames[:] = [dirname for dirname in dirnames if dirname not in IGNORED_DIR_NAMES]
-            for filename in filenames:
-                if filename.endswith(".py"):
-                    yield Path(dirpath) / filename
-
-
-def scan_paths(paths: Iterable[Path], *, repo_root: Path = REPO_ROOT) -> list[BoundaryFinding]:
-    findings: list[BoundaryFinding] = []
-    for path in sorted(iter_python_files(paths)):
-        findings.extend(scan_file(path, repo_root=repo_root))
-    return sorted(findings, key=lambda finding: (finding.path, finding.line, finding.column, finding.category))
-
-
-def filter_findings(findings: Iterable[BoundaryFinding], min_severity: str) -> list[BoundaryFinding]:
-    threshold = SEVERITY_ORDER[min_severity]
-    return [finding for finding in findings if SEVERITY_ORDER[finding.severity] >= threshold]
-
-
-def format_text(findings: Sequence[BoundaryFinding]) -> str:
-    if not findings:
-        return "No async/thread boundary findings."
-
-    lines: list[str] = []
-    for finding in findings:
-        lines.append(f"{finding.severity} {finding.category} {finding.path}:{finding.line}:{finding.column + 1} in {finding.function} async={str(finding.async_context).lower()}")
-        lines.append(f"  symbol: {finding.symbol}")
-        lines.append(f"  note: {finding.message}")
-        if finding.code:
-            lines.append(f"  code: {finding.code}")
-    return "\n".join(lines)
-
-
-def build_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser(description=("Detect async/thread boundary points for developer review. Findings are an inventory, not automatic bug decisions."))
-    parser.add_argument(
-        "paths",
-        nargs="*",
-        type=Path,
-        help="Files or directories to scan. Defaults to backend app and harness sources.",
-    )
-    parser.add_argument(
-        "--format",
-        choices=("text", "json"),
-        default="text",
-        help="Output format.",
-    )
-    parser.add_argument(
-        "--min-severity",
-        choices=tuple(SEVERITY_ORDER),
-        default="INFO",
-        help="Only show findings at or above this severity.",
-    )
-    return parser
-
-
-def main(argv: Sequence[str] | None = None) -> int:
-    parser = build_parser()
-    args = parser.parse_args(argv)
-    paths = args.paths or list(DEFAULT_SCAN_PATHS)
-    findings = filter_findings(scan_paths(paths), args.min_severity)
-
-    if args.format == "json":
-        print(json.dumps([finding.to_dict() for finding in findings], indent=2, sort_keys=True))
-    else:
-        print(format_text(findings))
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

backend/tests/test_aio_sandbox.py

@@ -233,88 +233,3 @@ class TestConcurrentFileWrites:
             thread.join()
 
         assert storage["content"] in {"seed\nA\nB\n", "seed\nB\nA\n"}
-
-
-class TestDownloadFile:
-    """Tests for AioSandbox.download_file."""
-
-    def test_returns_concatenated_bytes(self, sandbox):
-        """download_file should join chunks from the client iterator into bytes."""
-        sandbox._client.file.download_file = MagicMock(return_value=[b"hel", b"lo"])
-
-        result = sandbox.download_file("/mnt/user-data/outputs/file.bin")
-
-        assert result == b"hello"
-        sandbox._client.file.download_file.assert_called_once_with(path="/mnt/user-data/outputs/file.bin")
-
-    def test_returns_empty_bytes_for_empty_file(self, sandbox):
-        """download_file should return b'' when the iterator yields nothing."""
-        sandbox._client.file.download_file = MagicMock(return_value=iter([]))
-
-        result = sandbox.download_file("/mnt/user-data/outputs/empty.bin")
-
-        assert result == b""
-
-    def test_uses_lock_during_download(self, sandbox):
-        """download_file should hold the lock while calling the client."""
-        lock_was_held = []
-
-        def tracking_download(path):
-            lock_was_held.append(sandbox._lock.locked())
-            return iter([b"data"])
-
-        sandbox._client.file.download_file = tracking_download
-
-        sandbox.download_file("/mnt/user-data/outputs/file.bin")
-
-        assert lock_was_held == [True], "download_file must hold the lock during client call"
-
-    def test_raises_oserror_on_client_error(self, sandbox):
-        """download_file should wrap client exceptions as OSError."""
-        sandbox._client.file.download_file = MagicMock(side_effect=RuntimeError("network error"))
-
-        with pytest.raises(OSError, match="network error"):
-            sandbox.download_file("/mnt/user-data/outputs/file.bin")
-
-    def test_preserves_oserror_from_client(self, sandbox):
-        """OSError raised by the client should propagate without re-wrapping."""
-        sandbox._client.file.download_file = MagicMock(side_effect=OSError("disk error"))
-
-        with pytest.raises(OSError, match="disk error"):
-            sandbox.download_file("/mnt/user-data/outputs/file.bin")
-
-    def test_rejects_path_outside_virtual_prefix_and_logs_error(self, sandbox, caplog):
-        """download_file must reject downloads outside /mnt/user-data and log the reason."""
-        sandbox._client.file.download_file = MagicMock()
-
-        with caplog.at_level("ERROR"):
-            with pytest.raises(PermissionError, match="must be under"):
-                sandbox.download_file("/etc/passwd")
-
-        assert "outside allowed directory" in caplog.text
-        sandbox._client.file.download_file.assert_not_called()
-
-    @pytest.mark.parametrize(
-        "path",
-        [
-            "/mnt/workspace/../../etc/passwd",
-            "../secret",
-            "/a/b/../../../etc/shadow",
-        ],
-    )
-    def test_rejects_path_traversal(self, sandbox, path):
-        """download_file must reject paths containing '..' before calling the client."""
-        sandbox._client.file.download_file = MagicMock()
-
-        with pytest.raises(PermissionError, match="path traversal"):
-            sandbox.download_file(path)
-
-        sandbox._client.file.download_file.assert_not_called()
-
-    def test_single_chunk(self, sandbox):
-        """download_file should work correctly with a single-chunk response."""
-        sandbox._client.file.download_file = MagicMock(return_value=[b"single-chunk"])
-
-        result = sandbox.download_file("/mnt/user-data/outputs/single.bin")
-
-        assert result == b"single-chunk"

backend/tests/test_aio_sandbox_auto_restart.py

@@ -0,0 +1,210 @@
+"""Tests for AioSandboxProvider auto-restart of crashed containers."""
+
+import importlib
+import threading
+from unittest.mock import MagicMock, patch
+
+
+def _import_provider():
+    return importlib.import_module("deerflow.community.aio_sandbox.aio_sandbox_provider")
+
+
+def _make_provider(*, auto_restart=True, alive=True):
+    """Build a minimal AioSandboxProvider with a mock backend.
+
+    Args:
+        auto_restart: Value for the auto_restart config key.
+        alive: Whether the mock backend reports containers as alive.
+    """
+    mod = _import_provider()
+    with patch.object(mod.AioSandboxProvider, "_start_idle_checker"):
+        provider = mod.AioSandboxProvider.__new__(mod.AioSandboxProvider)
+        provider._config = {"auto_restart": auto_restart}
+        provider._lock = threading.Lock()
+        provider._sandboxes = {}
+        provider._sandbox_infos = {}
+        provider._thread_sandboxes = {}
+        provider._thread_locks = {}
+        provider._last_activity = {}
+        provider._warm_pool = {}
+        provider._shutdown_called = False
+        provider._idle_checker_stop = threading.Event()
+
+        backend = MagicMock()
+        backend.is_alive.return_value = alive
+        provider._backend = backend
+
+    return provider, backend
+
+
+def _seed_sandbox(provider, sandbox_id="dead-beef", thread_id="thread-1"):
+    """Insert a sandbox into the provider's caches as if it were acquired."""
+    sandbox = MagicMock()
+    info = MagicMock()
+
+    provider._sandboxes[sandbox_id] = sandbox
+    provider._sandbox_infos[sandbox_id] = info
+    provider._last_activity[sandbox_id] = 0.0
+    if thread_id:
+        provider._thread_sandboxes[thread_id] = sandbox_id
+
+    return sandbox, info
+
+
+# ── get() returns sandbox when container is alive ──────────────────────────
+
+
+def test_get_returns_sandbox_when_container_alive():
+    """When auto_restart is on and the container is alive, get() returns the sandbox."""
+    provider, backend = _make_provider(auto_restart=True, alive=True)
+    sandbox, _ = _seed_sandbox(provider)
+
+    result = provider.get("dead-beef")
+
+    assert result is sandbox
+    backend.is_alive.assert_called_once()
+
+
+def test_get_returns_sandbox_when_auto_restart_disabled():
+    """When auto_restart is off, get() skips the health check entirely."""
+    provider, backend = _make_provider(auto_restart=False)
+    sandbox, _ = _seed_sandbox(provider)
+
+    result = provider.get("dead-beef")
+
+    assert result is sandbox
+    backend.is_alive.assert_not_called()
+
+
+# ── get() evicts dead sandbox when auto_restart is on ──────────────────────
+
+
+def test_get_evicts_dead_sandbox_when_auto_restart_enabled():
+    """When the container is dead and auto_restart is on, get() returns None and cleans caches."""
+    provider, backend = _make_provider(auto_restart=True, alive=False)
+    _, info = _seed_sandbox(provider, sandbox_id="dead-beef", thread_id="thread-1")
+
+    result = provider.get("dead-beef")
+
+    assert result is None
+    assert "dead-beef" not in provider._sandboxes
+    assert "dead-beef" not in provider._sandbox_infos
+    assert "dead-beef" not in provider._last_activity
+    assert "thread-1" not in provider._thread_sandboxes
+    backend.destroy.assert_called_once_with(info)
+
+
+def test_get_returns_dead_sandbox_when_auto_restart_disabled():
+    """When auto_restart is off, get() returns the cached sandbox even if the container is dead."""
+    provider, backend = _make_provider(auto_restart=False, alive=False)
+    sandbox, _ = _seed_sandbox(provider)
+
+    result = provider.get("dead-beef")
+
+    assert result is sandbox
+    # Caches are untouched
+    assert "dead-beef" in provider._sandboxes
+
+
+def test_get_eviction_cleans_multiple_thread_mappings():
+    """A sandbox mapped to multiple thread IDs has all mappings cleaned on eviction."""
+    provider, backend = _make_provider(auto_restart=True, alive=False)
+    _seed_sandbox(provider, sandbox_id="sid-1", thread_id="t-a")
+    # Manually add a second thread mapping to the same sandbox
+    provider._thread_sandboxes["t-b"] = "sid-1"
+
+    result = provider.get("sid-1")
+
+    assert result is None
+    assert "t-a" not in provider._thread_sandboxes
+    assert "t-b" not in provider._thread_sandboxes
+
+
+# ── get() does not check health for unknown sandbox IDs ────────────────────
+
+
+def test_get_returns_none_for_unknown_id():
+    """If the sandbox_id is not in cache, get() returns None without checking health."""
+    provider, backend = _make_provider(auto_restart=True, alive=True)
+
+    result = provider.get("nonexistent")
+
+    assert result is None
+    backend.is_alive.assert_not_called()
+
+
+# ── get() handles missing sandbox_info gracefully ──────────────────────────
+
+
+def test_get_handles_missing_info_gracefully():
+    """If sandbox is cached but info is missing, get() skips the health check."""
+    provider, backend = _make_provider(auto_restart=True, alive=False)
+    sandbox = MagicMock()
+    provider._sandboxes["sid-x"] = sandbox
+    provider._sandbox_infos.pop("sid-x", None)  # Ensure no info
+    provider._last_activity["sid-x"] = 0.0
+
+    result = provider.get("sid-x")
+
+    # No info → cannot call is_alive → sandbox returned as-is
+    assert result is sandbox
+    backend.is_alive.assert_not_called()
+
+
+def test_get_liveness_check_runs_outside_provider_lock():
+    """get() should not hold the provider lock while checking backend liveness."""
+    provider, backend = _make_provider(auto_restart=True, alive=False)
+    _seed_sandbox(provider, sandbox_id="sid-locked", thread_id="thread-1")
+
+    def _assert_lock_not_held(_):
+        assert not provider._lock.locked()
+        return False
+
+    backend.is_alive.side_effect = _assert_lock_not_held
+
+    assert provider.get("sid-locked") is None
+
+
+def test_get_still_evicts_when_backend_destroy_fails():
+    """Cleanup errors should not keep stale sandbox state in memory."""
+    provider, backend = _make_provider(auto_restart=True, alive=False)
+    _seed_sandbox(provider, sandbox_id="sid-fail", thread_id="thread-1")
+    backend.destroy.side_effect = RuntimeError("boom")
+
+    assert provider.get("sid-fail") is None
+    assert "sid-fail" not in provider._sandboxes
+    assert "sid-fail" not in provider._sandbox_infos
+    assert "thread-1" not in provider._thread_sandboxes
+    backend.destroy.assert_called_once()
+
+
+# ── Integration: eviction clears caches for recreation ─────────────────────
+
+
+def test_eviction_clears_all_caches_for_recreation():
+    """After eviction, all caches are clean so _acquire_internal can recreate.
+
+    This verifies the preconditions for transparent restart: when get() evicts
+    a dead sandbox, the next _acquire_internal call will find no cached entry,
+    no warm-pool entry, and fall through to _create_sandbox.
+    """
+    provider, backend = _make_provider(auto_restart=True, alive=False)
+    _seed_sandbox(provider, sandbox_id="sid-1", thread_id="thread-1")
+
+    # Before eviction: caches populated
+    assert "sid-1" in provider._sandboxes
+    assert "sid-1" in provider._sandbox_infos
+    assert "thread-1" in provider._thread_sandboxes
+
+    # get() detects the dead container and evicts
+    assert provider.get("sid-1") is None
+
+    # After eviction: all caches clean
+    assert "sid-1" not in provider._sandboxes
+    assert "sid-1" not in provider._sandbox_infos
+    assert "thread-1" not in provider._thread_sandboxes
+    assert "sid-1" not in provider._warm_pool
+
+    # _acquire_internal for the same thread would find nothing cached
+    # and generate the deterministic ID, then discover fails (container
+    # is gone), falling through to _create_sandbox — a fresh start.