diff --git a/src/api/routes.py b/src/api/routes.py
index 1cc117e..19efe7a 100644
--- a/src/api/routes.py
+++ b/src/api/routes.py
@@ -326,22 +326,18 @@ class LoadKnowledgeRequest(BaseModel):
     docs_path: str = "docs"
 
 
-@router.post("/knowledge/load")
-async def load_knowledge(body: LoadKnowledgeRequest) -> dict[str, Any]:
-    """Load markdown docs from a directory into the knowledge base.
-
-    Generates embeddings for semantic search via OpenAI text-embedding-3-small.
-    """
+async def _load_knowledge_from_dir(docs_path: str = "docs") -> dict[str, Any]:
+    """Load knowledge docs from directory. Used by endpoint and startup."""
     memory = _deps.get("memory_store")
     if not memory:
-        raise HTTPException(status_code=501, detail="Memory store not available")
+        return {"status": "error", "message": "Memory store not available"}
 
-    docs_dir = pathlib.Path(body.docs_path)
+    docs_dir = pathlib.Path(docs_path)
     if not docs_dir.is_absolute():
-        docs_dir = pathlib.Path(__file__).resolve().parent.parent.parent / body.docs_path
+        docs_dir = pathlib.Path(__file__).resolve().parent.parent.parent / docs_path
 
     if not docs_dir.is_dir():
-        raise HTTPException(status_code=400, detail=f"Directory not found: {docs_dir}")
+        return {"status": "error", "message": f"Directory not found: {docs_dir}"}
 
     # Read all docs
     docs_data: list[tuple[str, str, str, str, list[str]]] = []  # (id, title, content, summary, tags)
@@ -415,6 +411,18 @@ async def load_knowledge(body: LoadKnowledgeRequest) -> dict[str, Any]:
     }
 
 
+@router.post("/knowledge/load")
+async def load_knowledge(body: LoadKnowledgeRequest) -> dict[str, Any]:
+    """Load markdown docs from a directory into the knowledge base.
+
+    Generates embeddings for semantic search via OpenAI text-embedding-3-small.
+    """
+    result = await _load_knowledge_from_dir(body.docs_path)
+    if result.get("status") == "error":
+        raise HTTPException(status_code=501, detail=result["message"])
+    return result
+
+
 @router.get("/knowledge")
 async def list_knowledge() -> dict[str, Any]:
     """List all documents in the knowledge base."""
diff --git a/src/main.py b/src/main.py
index 5fbcdef..4d5179f 100644
--- a/src/main.py
+++ b/src/main.py
@@ -95,6 +95,14 @@ async def lifespan(app: FastAPI):
         mcp_registry=mcp_registry,
     )
 
+    # 7. Auto-load knowledge base
+    from .api.routes import _load_knowledge_from_dir
+    try:
+        kb_result = await _load_knowledge_from_dir("docs")
+        logger.info("Knowledge auto-loaded: %d docs, embeddings=%s", kb_result.get("count", 0), kb_result.get("embeddings", False))
+    except Exception as e:
+        logger.warning("Failed to auto-load knowledge: %s", e)
+
     logger.info("All systems initialized. Serving on %s:%d", settings.host, settings.port)
 
     yield