ultimate-pi 0.4.1 → 0.6.0

package/.pi/scripts/harness_web/config.py

@@ -6,6 +6,8 @@ import os
 from dataclasses import dataclass
 from urllib.parse import urlparse
 
+SUPPORTED_SEARCH_ENGINES = frozenset({"ddg_html", "searxng"})
+
 
 def _int_env(name: str, default: int) -> int:
     raw = os.environ.get(name, "").strip()
@@ -24,6 +26,18 @@ def _fetch_mode() -> str:
     return "stealth"
 
 
+def _normalize_searxng_url(raw: str) -> str:
+    url = raw.strip().rstrip("/")
+    if not url:
+        return ""
+    parsed = urlparse(url)
+    if parsed.scheme not in ("http", "https") or not parsed.netloc:
+        raise SystemExit(
+            f"Invalid HARNESS_WEB_SEARXNG_URL={raw!r} — expected http(s)://host[:port]"
+        )
+    return url
+
+
 _STATIC_HOSTS = frozenset(
     {
         "example.com",
@@ -50,6 +64,7 @@ def host_is_static(url: str) -> bool:
 class HarnessWebConfig:
     fetch_mode: str
     search_engine: str
+    searxng_url: str | None
     proxy: str | None
     rate_limit_ms: int
     timeout_ms: int
@@ -68,13 +83,32 @@ class HarnessWebConfig:
         return False
 
 
+def validate_search_config(config: HarnessWebConfig) -> None:
+    engine = config.search_engine
+    if engine not in SUPPORTED_SEARCH_ENGINES:
+        supported = ", ".join(sorted(SUPPORTED_SEARCH_ENGINES))
+        raise SystemExit(
+            f"Unsupported HARNESS_WEB_SEARCH_ENGINE={engine!r} (supported: {supported})"
+        )
+    if engine == "searxng" and not config.searxng_url:
+        raise SystemExit(
+            "HARNESS_WEB_SEARCH_ENGINE=searxng requires HARNESS_WEB_SEARXNG_URL "
+            "(e.g. http://127.0.0.1:8080). Run /harness-setup and choose SearXNG, or set both in .env."
+        )
+
+
 def load_config() -> HarnessWebConfig:
     proxy = os.environ.get("HARNESS_WEB_PROXY", "").strip() or None
-    return HarnessWebConfig(
+    engine = os.environ.get("HARNESS_WEB_SEARCH_ENGINE", "ddg_html").strip() or "ddg_html"
+    searx_raw = os.environ.get("HARNESS_WEB_SEARXNG_URL", "").strip()
+    searxng_url = _normalize_searxng_url(searx_raw) if searx_raw else None
+    config = HarnessWebConfig(
         fetch_mode=_fetch_mode(),
-        search_engine=os.environ.get("HARNESS_WEB_SEARCH_ENGINE", "ddg_html").strip()
-        or "ddg_html",
+        search_engine=engine,
+        searxng_url=searxng_url,
         proxy=proxy,
         rate_limit_ms=_int_env("HARNESS_WEB_RATE_LIMIT_MS", 2000),
         timeout_ms=_int_env("HARNESS_WEB_TIMEOUT_MS", 30000),
     )
+    validate_search_config(config)
+    return config

package/.pi/scripts/harness_web/output.py

@@ -18,13 +18,19 @@ def write_json(path: Path, payload: Any) -> None:
     path.write_text(json.dumps(payload, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
 
 
-def write_search_results(path: Path, results: list[dict[str, str]], query: str) -> None:
+def write_search_results(
+    path: Path,
+    results: list[dict[str, str]],
+    query: str,
+    *,
+    engine: str,
+) -> None:
     """Firecrawl-compatible envelope: data.web[].url|title|description."""
     write_json(
         path,
         {
             "query": query,
-            "engine": "ddg_html",
+            "engine": engine,
             "data": {
                 "web": [
                     {

package/.pi/scripts/harness_web/search.py

@@ -0,0 +1,22 @@
+"""Route harness-web search to the configured SERP backend."""
+
+from __future__ import annotations
+
+from .config import HarnessWebConfig, validate_search_config
+from .search_ddg import search_ddg
+from .search_searxng import search_searxng
+
+
+def search(
+    query: str,
+    *,
+    limit: int,
+    config: HarnessWebConfig,
+) -> list[dict[str, str]]:
+    validate_search_config(config)
+    engine = config.search_engine
+    if engine == "searxng":
+        return search_searxng(query, limit=limit, config=config)
+    if engine == "ddg_html":
+        return search_ddg(query, limit=limit, config=config)
+    raise SystemExit(f"Unsupported HARNESS_WEB_SEARCH_ENGINE={engine!r}")

package/.pi/scripts/harness_web/search_ddg.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from typing import Any
 from urllib.parse import parse_qs, unquote, urlparse
 
 from scrapling.fetchers import Fetcher, StealthyFetcher
@@ -63,11 +64,6 @@ def search_ddg(
     config: HarnessWebConfig,
     impersonate: bool = True,
 ) -> list[dict[str, str]]:
-    if config.search_engine != "ddg_html":
-        raise SystemExit(
-            f"Unsupported HARNESS_WEB_SEARCH_ENGINE={config.search_engine!r} (only ddg_html)"
-        )
-
     kwargs: dict = {
         "params": {"q": query},
         "timeout": config.timeout_sec,

package/.pi/scripts/harness_web/search_searxng.py

@@ -0,0 +1,100 @@
+"""SearXNG JSON search API (self-hosted instances)."""
+
+from __future__ import annotations
+
+import json
+import ssl
+from typing import Any
+from urllib.error import HTTPError, URLError
+from urllib.parse import urlencode
+from urllib.request import ProxyHandler, Request, build_opener, urlopen
+
+from .config import HarnessWebConfig
+
+
+def _open_url(url: str, *, config: HarnessWebConfig) -> tuple[int, str]:
+    req = Request(
+        url,
+        headers={"Accept": "application/json", "User-Agent": "ultimate-pi-harness-web/1.0"},
+        method="GET",
+    )
+    if config.proxy:
+        opener = build_opener(ProxyHandler({"http": config.proxy, "https": config.proxy}))
+        resp = opener.open(req, timeout=config.timeout_sec)
+    else:
+        ctx = ssl.create_default_context()
+        resp = urlopen(req, timeout=config.timeout_sec, context=ctx)
+    try:
+        status = getattr(resp, "status", 200) or 200
+        body = resp.read().decode("utf-8", errors="replace")
+        return status, body
+    finally:
+        resp.close()
+
+
+def _parse_results(payload: Any, limit: int) -> list[dict[str, str]]:
+    raw = payload.get("results") if isinstance(payload, dict) else None
+    if not isinstance(raw, list):
+        return []
+    out: list[dict[str, str]] = []
+    for item in raw:
+        if len(out) >= limit:
+            break
+        if not isinstance(item, dict):
+            continue
+        url = (item.get("url") or "").strip()
+        if not url.startswith("http"):
+            continue
+        title = (item.get("title") or "").strip()
+        description = (item.get("content") or item.get("snippet") or "").strip()
+        out.append({"url": url, "title": title, "description": description})
+    return out
+
+
+def search_searxng(
+    query: str,
+    *,
+    limit: int,
+    config: HarnessWebConfig,
+) -> list[dict[str, str]]:
+    base = config.searxng_url
+    if not base:
+        raise SystemExit("HARNESS_WEB_SEARXNG_URL is not set")
+
+    qs = urlencode({"q": query, "format": "json", "pageno": "1"})
+    url = f"{base}/search?{qs}"
+
+    try:
+        status, body = _open_url(url, config=config)
+    except HTTPError as err:
+        status = err.code
+        body = err.read().decode("utf-8", errors="replace") if err.fp else ""
+    except URLError as err:
+        raise SystemExit(
+            f"SearXNG request failed ({err.reason}). "
+            f"Is the instance running at {base}? "
+            "Run: node \"$UP_PKG/.pi/scripts/harness-searxng-bootstrap.mjs\""
+        ) from err
+
+    if status == 403:
+        raise SystemExit(
+            "SearXNG returned 403 for format=json. Enable json under search.formats "
+            "in settings.yml (see .searxng/core-config/settings.yml or SearXNG docs)."
+        )
+    if status != 200:
+        snippet = body[:200].replace("\n", " ")
+        raise SystemExit(f"SearXNG search failed (HTTP {status}): {snippet}")
+
+    try:
+        payload = json.loads(body)
+    except json.JSONDecodeError as err:
+        raise SystemExit(f"SearXNG returned non-JSON response from {url}") from err
+
+    results = _parse_results(payload, limit)
+    if not results and isinstance(payload, dict):
+        unresponsive = payload.get("unresponsive_engines")
+        if unresponsive:
+            raise SystemExit(
+                f"SearXNG returned no results; upstream engines unresponsive: {unresponsive}"
+            )
+    return results

package/CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [v0.6.0] — 2026-05-17
+
+### ✨ Features
+
+- **sentrux Pi skill:** CLI-first architectural quality workflows (`check`, `gate`, GUI) via `/skill:sentrux`; symlinked in `.pi/skills`. Pi does not load `.pi/mcp.json`.
+
+### 📖 Documentation
+
+- **harness-setup / CONTRIBUTING:** document Sentrux skill instead of MCP config; update `harness-sentrux-setup` workflow.
+
+### 🔧 Chores
+
+- Remove shipped `.pi/mcp.json` from package `files` list; refresh `graphify-out`.
+
+## [v0.5.0] — 2026-05-17
+
+### ✨ Features
+
+- **web_search / web_fetch pi tools:** wrap `harness-web.py` with session injection and a bash guard so agents skip `UP_PKG` and scrapling import preflights.
+- **SearXNG search backend:** pluggable `HARNESS_WEB_SEARCH_ENGINE` (`ddg_html` | `searxng`) with Docker bootstrap via `harness-searxng-bootstrap.mjs`.
+- **harness-web status:** JSON config subcommand for setup and diagnostics.
+
+### 🔧 Chores
+
+- Apply pre-commit format and refresh `graphify-out` after harness-web tools merge.
+
 ## [v0.4.1] — 2026-05-17
 
 ### ✨ Features

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ultimate-pi",
-	"version": "0.4.1",
+	"version": "0.6.0",
 	"description": "Ultimate AI coding harness for pi.dev — extensible skills, Obsidian wiki knowledge layer, compressed context, deterministic output",
 	"keywords": [
 		"pi-package",
@@ -59,7 +59,6 @@
 		".pi/model-router.example.json",
 		".pi/settings.example.json",
 		".pi/auto-commit.json",
-		".pi/mcp.json",
 		".pi/SYSTEM.md",
 		".pi/PACKAGING.md",
 		"AGENTS.md",
@@ -74,7 +73,7 @@
 		"@mariozechner/pi-coding-agent": "*"
 	},
 	"scripts": {
-		"check:ts": "tsc --noEmit --target ES2023 --lib ES2023 --moduleResolution nodenext --module nodenext --skipLibCheck .pi/extensions/lib/harness-vcc-settings.ts .pi/extensions/dotenv-loader.ts .pi/extensions/lib/posthog-node.d.ts .pi/extensions/lib/harness-posthog.ts .pi/extensions/lib/harness-paths.ts .pi/extensions/pi-model-router-harness.ts .pi/extensions/provider-payload-sanitize.ts .pi/extensions/harness-telemetry.ts .pi/extensions/harness-ask-user.ts .pi/extensions/lib/ask-user/schema.ts .pi/extensions/lib/ask-user/types.ts .pi/extensions/lib/ask-user/validate.ts .pi/extensions/lib/ask-user/dialog.ts .pi/extensions/lib/ask-user/fallback.ts .pi/extensions/lib/ask-user/render.ts .pi/extensions/trace-recorder.ts .pi/extensions/observation-bus.ts .pi/extensions/drift-monitor.ts .pi/extensions/sentrux-rules-sync.ts .pi/extensions/custom-header.ts .pi/extensions/lib/harness-subagents/agent-loader.ts .pi/extensions/lib/harness-subagents/agent-parser.ts .pi/extensions/lib/harness-subagents/agent-manifest.ts .pi/extensions/lib/harness-subagents/blackboard.ts .pi/extensions/lib/harness-subagents/blackboard-tool.ts .pi/extensions/lib/harness-subagents/spawn-policy.ts .pi/extensions/lib/harness-subagents/types-blackboard.ts",
+		"check:ts": "tsc --noEmit --target ES2023 --lib ES2023 --moduleResolution nodenext --module nodenext --skipLibCheck .pi/extensions/lib/harness-vcc-settings.ts .pi/extensions/dotenv-loader.ts .pi/extensions/lib/posthog-node.d.ts .pi/extensions/lib/harness-posthog.ts .pi/extensions/lib/harness-paths.ts .pi/extensions/pi-model-router-harness.ts .pi/extensions/provider-payload-sanitize.ts .pi/extensions/harness-telemetry.ts .pi/extensions/harness-ask-user.ts .pi/extensions/lib/ask-user/schema.ts .pi/extensions/lib/ask-user/types.ts .pi/extensions/lib/ask-user/validate.ts .pi/extensions/lib/ask-user/dialog.ts .pi/extensions/lib/ask-user/fallback.ts .pi/extensions/lib/ask-user/render.ts .pi/extensions/trace-recorder.ts .pi/extensions/observation-bus.ts .pi/extensions/drift-monitor.ts .pi/extensions/sentrux-rules-sync.ts .pi/extensions/custom-header.ts .pi/extensions/lib/harness-subagents/agent-loader.ts .pi/extensions/lib/harness-subagents/agent-parser.ts .pi/extensions/lib/harness-subagents/agent-manifest.ts .pi/extensions/lib/harness-subagents/blackboard.ts .pi/extensions/lib/harness-subagents/blackboard-tool.ts .pi/extensions/lib/harness-subagents/spawn-policy.ts .pi/extensions/lib/harness-subagents/types-blackboard.ts .pi/extensions/harness-web-tools.ts .pi/extensions/harness-web-guard.ts .pi/extensions/lib/harness-web/run-cli.ts",
 		"vendor:sync-router": "bash .pi/scripts/vendor-sync-pi-model-router.sh",
 		"vendor:sync-vcc": "bash .pi/scripts/vendor-sync-pi-vcc.sh",
 		"release": "bash .pi/scripts/release.sh",

package/.pi/mcp.json

@@ -1,11 +0,0 @@
-{
-	"mcpServers": {
-		"context-mode": {
-			"command": "context-mode"
-		},
-		"sentrux": {
-			"command": "sentrux",
-			"args": ["--mcp"]
-		}
-	}
-}