Skip to content

Hypergraph is more powerful. Transform unstructured text into structured knowledge with LLMs. Graphs, hypergraphs, and spatio-temporal extractions — with one command.

fix: resolve leftover conflict markers in MCP docs

Frankie-Xue0c9309f4587
diff --git a/docs/en/mcp.md b/docs/en/mcp.md
index c4274d9..19b0676 100644
--- a/docs/en/mcp.md
+++ b/docs/en/mcp.md
@@ -48,19 +48,12 @@ Point your MCP client at the `he-mcp` command. For a Claude Desktop–style conf
| `export_obsidian` | Export a KA to an Obsidian vault | — | embedder |
| `export_graphml` | Export a KA to GraphML (same as `he export graphml`) | — | embedder |
| `export_csv` | Export a KA to CSV tables (same as `he export csv`) | — | embedder |
-<<<<<<< HEAD
-| `export_cypher` | Export a KA to Cypher (same as `he export cypher`) | — | embedder |
-
-All tools take a `ka_path` (a directory created by `he parse`). `search`/`ask` require an index — build it with [`he build-index`](cli/commands/build-index.md).
-
-> `export_obsidian` requires the Obsidian export feature (see [`he export obsidian`](cli/commands/export.md)). If it is unavailable, the tool returns an explanatory message instead of failing. `export_graphml` / `export_csv` / `export_cypher` use the same exporters as the CLI (see [`he export`](cli/commands/export.md)).
-=======
| `export_jsonld` | Export a KA to JSON-LD (same as `he export jsonld`) | — | embedder |
+| `export_cypher` | Export a KA to Cypher (same as `he export cypher`) | — | embedder |
All tools take a `ka_path` (a directory created by `he parse`). `search`/`ask` require an index — build it with [`he build-index`](cli/commands/build-index.md).
-> `export_obsidian` requires the Obsidian export feature (see [`he export obsidian`](cli/commands/export.md)). If it is unavailable, the tool returns an explanatory message instead of failing. `export_graphml` / `export_csv` / `export_jsonld` use the same exporters as the CLI (see [`he export`](cli/commands/export.md)).
->>>>>>> origin/main
+> `export_obsidian` requires the Obsidian export feature (see [`he export obsidian`](cli/commands/export.md)). If it is unavailable, the tool returns an explanatory message instead of failing. `export_graphml` / `export_csv` / `export_jsonld` / `export_cypher` use the same exporters as the CLI (see [`he export`](cli/commands/export.md)).
---
@@ -75,4 +68,8 @@ ask(ka_path="./tesla_kb",
question="Who were Tesla's rivals?") → "Thomas Edison ..."
export_obsidian(ka_path="./tesla_kb",
output="./vault") → "Exported 49 notes to ./vault"
+export_jsonld(ka_path="./tesla_kb",
+ output="./tesla.jsonld") → "Exported JSON-LD to ./tesla.jsonld"
+export_cypher(ka_path="./tesla_kb",
+ output="./tesla.cypher") → "Exported Cypher to ./tesla.cypher"
```
diff --git a/docs/zh/mcp.md b/docs/zh/mcp.md
index 6589e06..255aba6 100644
--- a/docs/zh/mcp.md
+++ b/docs/zh/mcp.md
@@ -48,19 +48,12 @@ python -m hyperextract.mcp_server
| `export_obsidian` | 将 KA 导出为 Obsidian 知识库 | — | 嵌入器 |
| `export_graphml` | 将 KA 导出为 GraphML(同 `he export graphml`) | — | 嵌入器 |
| `export_csv` | 将 KA 导出为 CSV 表(同 `he export csv`) | — | 嵌入器 |
-<<<<<<< HEAD
-| `export_cypher` | 将 KA 导出为 Cypher(同 `he export cypher`) | — | 嵌入器 |
-
-所有工具都接受一个 `ka_path`(由 `he parse` 创建的目录)。`search`/`ask` 需要索引——用 [`he build-index`](cli/commands/build-index.md) 构建。
-
-> `export_obsidian` 依赖 Obsidian 导出功能(见 [`he export obsidian`](cli/commands/export.md))。若不可用,该工具会返回说明信息而不会报错。`export_graphml` / `export_csv` / `export_cypher` 使用与 CLI 相同的导出器(见 [`he export`](cli/commands/export.md))。
-=======
| `export_jsonld` | 将 KA 导出为 JSON-LD(同 `he export jsonld`) | — | 嵌入器 |
+| `export_cypher` | 将 KA 导出为 Cypher(同 `he export cypher`) | — | 嵌入器 |
所有工具都接受一个 `ka_path`(由 `he parse` 创建的目录)。`search`/`ask` 需要索引——用 [`he build-index`](cli/commands/build-index.md) 构建。
-> `export_obsidian` 依赖 Obsidian 导出功能(见 [`he export obsidian`](cli/commands/export.md))。若不可用,该工具会返回说明信息而不会报错。`export_graphml` / `export_csv` / `export_jsonld` 使用与 CLI 相同的导出器(见 [`he export`](cli/commands/export.md))。
->>>>>>> origin/main
+> `export_obsidian` 依赖 Obsidian 导出功能(见 [`he export obsidian`](cli/commands/export.md))。若不可用,该工具会返回说明信息而不会报错。`export_graphml` / `export_csv` / `export_jsonld` / `export_cypher` 使用与 CLI 相同的导出器(见 [`he export`](cli/commands/export.md))。
---
@@ -75,4 +68,8 @@ ask(ka_path="./tesla_kb",
question="Who were Tesla's rivals?") → "Thomas Edison ..."
export_obsidian(ka_path="./tesla_kb",
output="./vault") → "Exported 49 notes to ./vault"
+export_jsonld(ka_path="./tesla_kb",
+ output="./tesla.jsonld") → "Exported JSON-LD to ./tesla.jsonld"
+export_cypher(ka_path="./tesla_kb",
+ output="./tesla.cypher") → "Exported Cypher to ./tesla.cypher"
```
diff --git a/tests/docs/test_no_conflict_markers.py b/tests/docs/test_no_conflict_markers.py
new file mode 100644
index 0000000..bdf95e8
--- /dev/null
+++ b/tests/docs/test_no_conflict_markers.py
@@ -0,0 +1,18 @@
+"""Regression: published docs must not contain leftover git conflict markers."""
+
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+DOCS_ROOT = REPO_ROOT / "docs"
+
+
+def test_docs_have_no_git_conflict_markers():
+ offenders: list[str] = []
+ for path in sorted(DOCS_ROOT.rglob("*.md")):
+ text = path.read_text(encoding="utf-8")
+ for lineno, line in enumerate(text.splitlines(), start=1):
+ if line.startswith("<<<<<<<") or line.startswith(">>>>>>>"):
+ offenders.append(f"{path.relative_to(REPO_ROOT)}:{lineno}:{line}")
+ elif line == "=======":
+ offenders.append(f"{path.relative_to(REPO_ROOT)}:{lineno}:{line}")
+ assert not offenders, "leftover git conflict markers:\n" + "\n".join(offenders)