@trim21/personal-pi-extensions 0.0.436 → 0.1.437

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.436",
+  "version": "0.1.437",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -70,7 +70,8 @@
       "src/spawn-agent.ts",
       "src/system-prompt/index.ts",
       "src/talk/index.ts",
-      "src/web/index.ts"
+      "src/web/search.ts",
+      "src/web/fetch.ts"
     ],
     "skills": [
       "src/talk/skills"

package/src/web/fetch.ts

@@ -1,20 +1,25 @@
 /**
- * web_fetch：抓取 URL 并提取正文为 markdown。
+ * `web_fetch` 工具：抓取 URL 并提取正文为 markdown。
  *
  * SSRF 防护：DNS 预解析 + 拒绝私有/保留地址 + 每跳重定向重新校验，
  * 防止把 agent 变成内网探测口。正文提取用 readability 主内容算法。
+ *
+ * 本文件是独立扩展入口（见 package.json 的 pi.extensions），可在配置里单独禁用。
  */
 import { lookup } from "node:dns/promises";
 import { isIP } from "node:net";
 
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Readability } from "@mozilla/readability";
 import { parseHTML } from "linkedom";
 import TurndownService from "turndown";
+import { Type } from "typebox";
 
 const MAX_REDIRECTS = 5;
 const TIMEOUT_MS = 30_000;
 const MAX_BYTES = 5 * 1024 * 1024;
 const MIN_USEFUL_CONTENT = 200;
+const MAX_MARKDOWN_BYTES = 100 * 1024;
 
 function isPrivateIpv4(ip: string): boolean {
   const parts = ip.split(".").map(Number);
@@ -212,3 +217,50 @@ export function extractMarkdown(html: string, sourceUrl: string): FetchedPage {
     .trim();
   return { url: sourceUrl, title, markdown };
 }
+
+function truncateMarkdown(text: string): { text: string; truncated: boolean } {
+  if (Buffer.byteLength(text, "utf8") <= MAX_MARKDOWN_BYTES) return { text, truncated: false };
+  const bytes = Buffer.from(text, "utf8");
+  const sliced = bytes.subarray(0, MAX_MARKDOWN_BYTES).toString("utf8");
+  const cut = sliced.lastIndexOf("\n", sliced.length - 1);
+  return { text: (cut > 0 ? sliced.slice(0, cut) : sliced) + "\n…(已截断)", truncated: true };
+}
+
+export default function webFetchTool(pi: ExtensionAPI): void {
+  pi.registerTool({
+    name: "web_fetch",
+    label: "Web Fetch",
+    description:
+      "Fetch a URL and return its content as markdown (HTML pages) or raw text " +
+      "(JSON/XML/plain-text API responses). SSRF-protected: refuses private/internal " +
+      "addresses.",
+    promptSnippet: "Fetch a web page or API response",
+    parameters: Type.Object({
+      url: Type.String({ description: "The URL to fetch" }),
+    }),
+    async execute(_id, params, signal) {
+      try {
+        const page = await fetchPage(params.url, signal);
+        const { text, truncated } = truncateMarkdown(page.markdown);
+        const details: Record<string, unknown> = {
+          url: page.url,
+          title: page.title,
+          bytes: Buffer.byteLength(page.markdown, "utf8"),
+          truncated,
+        };
+        return {
+          content: [{ type: "text", text }],
+          details,
+        };
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        const details: Record<string, unknown> = { error: message, url: params.url };
+        return {
+          isError: true,
+          content: [{ type: "text", text: `抓取失败: ${message}` }],
+          details,
+        };
+      }
+    },
+  });
+}

package/src/web/search.ts

@@ -1,12 +1,18 @@
 /**
- * Search1API 搜索：请求构造、响应解析与结果整理。
+ * `web_search` 工具：Search1API 搜索的请求构造、响应解析、结果整理与注册。
  *
+ * key 读 ~/.pi/web-search.json 的 search1apiApiKey 或 SEARCH1API_KEY 环境变量。
  * 搜索响应不做 AI 预消化，直接返回整理后的结构化结果（title/url/snippet，
  * crawl_results 开启时含内联正文）——模型自己读，零额外模型调用。
+ *
+ * 本文件是独立扩展入口（见 package.json 的 pi.extensions），可在配置里单独禁用。
  */
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
+import { loadSearch1ApiKey } from "./config.js";
+
 const SEARCH_URL = "https://api.search1api.com/search";
 const TIMEOUT_MS = 60_000;
 
@@ -143,3 +149,118 @@ export async function searchWeb(
   const parsed = Value.Parse(searchResponseSchema, JSON.parse(raw));
   return { query, hits: mapHits(parsed.results) };
 }
+
+export default function webSearchTool(pi: ExtensionAPI): void {
+  pi.registerTool({
+    name: "web_search",
+    label: "Web Search",
+    description:
+      "Search the web via Search1API and return structured results " +
+      "(title/url/snippet, optionally inline content).",
+    promptSnippet: "Search the web",
+    parameters: Type.Object({
+      query: Type.Optional(
+        Type.String({ description: "Search query (mutually exclusive with queries)" }),
+      ),
+      queries: Type.Optional(
+        Type.Array(Type.String(), { description: "Multiple queries searched in sequence" }),
+      ),
+      numResults: Type.Optional(
+        Type.Number({ description: "Results per query (default: 5, max: 50)" }),
+      ),
+      recencyFilter: Type.Optional(
+        Type.String({ description: "Filter by recency: day, week, month, year" }),
+      ),
+      domainFilter: Type.Optional(
+        Type.Array(Type.String(), { description: "Limit to domains; prefix with - to exclude" }),
+      ),
+      searchService: Type.Optional(
+        Type.String({
+          description:
+            "Search engine: google, bing, duckduckgo, github, arxiv, reddit, youtube, etc.",
+        }),
+      ),
+      includeContent: Type.Optional(
+        Type.Boolean({ description: "Inline-fetch content for the top results (up to 5)" }),
+      ),
+    }),
+    async execute(_id, params, signal, onUpdate) {
+      try {
+        const queries = [...(params.query ? [params.query] : []), ...(params.queries ?? [])]
+          .map((q) => q.trim())
+          .filter(Boolean)
+          .slice(0, 4);
+        if (queries.length === 0) {
+          return {
+            isError: true,
+            content: [{ type: "text", text: "需要提供 query 或 queries（至少一个搜索词）。" }],
+            details: { error: "no query" },
+          };
+        }
+
+        const apiKey = await loadSearch1ApiKey();
+        if (!apiKey) {
+          return {
+            isError: true,
+            content: [
+              {
+                type: "text",
+                text: "未找到 Search1API key：请在 ~/.pi/web-search.json 配置 search1apiApiKey，或设置 SEARCH1API_KEY 环境变量。",
+              },
+            ],
+            details: { error: "search1api key not configured" },
+          };
+        }
+
+        onUpdate?.({
+          content: [{ type: "text", text: `正在搜索: ${queries.join(" / ")}` }],
+          details: {},
+        });
+
+        const common = {
+          numResults: params.numResults,
+          recencyFilter: params.recencyFilter,
+          domainFilter: params.domainFilter,
+          searchService: params.searchService,
+          includeContent: params.includeContent,
+          signal,
+        };
+        const results = await Promise.all(queries.map((query) => searchWeb(query, apiKey, common)));
+
+        // 按 URL 去重合并
+        const seen = new Set<string>();
+        const hits: SearchHit[] = [];
+        for (const result of results) {
+          for (const hit of result.hits) {
+            if (seen.has(hit.url)) continue;
+            seen.add(hit.url);
+            hits.push(hit);
+          }
+        }
+        if (hits.length === 0) {
+          return {
+            content: [{ type: "text", text: "没有找到结果。" }],
+            details: { query: queries, count: 0 },
+          };
+        }
+
+        return {
+          content: [{ type: "text", text: JSON.stringify(hits, null, 2) }],
+          details: {
+            query: queries,
+            provider: "search1api",
+            count: hits.length,
+            results: hits,
+          },
+        };
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return {
+          isError: true,
+          content: [{ type: "text", text: `搜索失败: ${message}` }],
+          details: { error: message },
+        };
+      }
+    },
+  });
+}

package/src/web/index.ts

@@ -1,175 +0,0 @@
-/**
- * web 扩展：自研 web_search + web_fetch，替代 pi-web-access。
- *
- * - web_search：Search1API 搜索（key 读 ~/.pi/web-search.json 的
- *   search1apiApiKey 或 SEARCH1API_KEY），直接返回整理后的结构化结果。
- * - web_fetch：抓取 URL，SSRF 防护 + readability 提取正文为 markdown。
- */
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-
-import { loadSearch1ApiKey } from "./config.js";
-import { fetchPage } from "./fetch.js";
-import { type SearchHit, searchWeb } from "./search.js";
-
-const MAX_MARKDOWN_BYTES = 100 * 1024;
-
-function truncateMarkdown(text: string): { text: string; truncated: boolean } {
-  if (Buffer.byteLength(text, "utf8") <= MAX_MARKDOWN_BYTES) return { text, truncated: false };
-  const bytes = Buffer.from(text, "utf8");
-  const sliced = bytes.subarray(0, MAX_MARKDOWN_BYTES).toString("utf8");
-  const cut = sliced.lastIndexOf("\n", sliced.length - 1);
-  return { text: (cut > 0 ? sliced.slice(0, cut) : sliced) + "\n…(已截断)", truncated: true };
-}
-
-export default function webTools(pi: ExtensionAPI) {
-  pi.registerTool({
-    name: "web_search",
-    label: "Web Search",
-    description:
-      "Search the web via Search1API and return structured results " +
-      "(title/url/snippet, optionally inline content).",
-    promptSnippet: "Search the web",
-    parameters: Type.Object({
-      query: Type.Optional(
-        Type.String({ description: "Search query (mutually exclusive with queries)" }),
-      ),
-      queries: Type.Optional(
-        Type.Array(Type.String(), { description: "Multiple queries searched in sequence" }),
-      ),
-      numResults: Type.Optional(
-        Type.Number({ description: "Results per query (default: 5, max: 50)" }),
-      ),
-      recencyFilter: Type.Optional(
-        Type.String({ description: "Filter by recency: day, week, month, year" }),
-      ),
-      domainFilter: Type.Optional(
-        Type.Array(Type.String(), { description: "Limit to domains; prefix with - to exclude" }),
-      ),
-      searchService: Type.Optional(
-        Type.String({
-          description:
-            "Search engine: google, bing, duckduckgo, github, arxiv, reddit, youtube, etc.",
-        }),
-      ),
-      includeContent: Type.Optional(
-        Type.Boolean({ description: "Inline-fetch content for the top results (up to 5)" }),
-      ),
-    }),
-    async execute(_id, params, signal, onUpdate) {
-      try {
-        const queries = [...(params.query ? [params.query] : []), ...(params.queries ?? [])]
-          .map((q) => q.trim())
-          .filter(Boolean)
-          .slice(0, 4);
-        if (queries.length === 0) {
-          return {
-            isError: true,
-            content: [{ type: "text", text: "需要提供 query 或 queries（至少一个搜索词）。" }],
-            details: { error: "no query" },
-          };
-        }
-
-        const apiKey = await loadSearch1ApiKey();
-        if (!apiKey) {
-          return {
-            isError: true,
-            content: [
-              {
-                type: "text",
-                text: "未找到 Search1API key：请在 ~/.pi/web-search.json 配置 search1apiApiKey，或设置 SEARCH1API_KEY 环境变量。",
-              },
-            ],
-            details: { error: "search1api key not configured" },
-          };
-        }
-
-        onUpdate?.({
-          content: [{ type: "text", text: `正在搜索: ${queries.join(" / ")}` }],
-          details: {},
-        });
-
-        const common = {
-          numResults: params.numResults,
-          recencyFilter: params.recencyFilter,
-          domainFilter: params.domainFilter,
-          searchService: params.searchService,
-          includeContent: params.includeContent,
-          signal,
-        };
-        const results = await Promise.all(queries.map((query) => searchWeb(query, apiKey, common)));
-
-        // 按 URL 去重合并
-        const seen = new Set<string>();
-        const hits: SearchHit[] = [];
-        for (const result of results) {
-          for (const hit of result.hits) {
-            if (seen.has(hit.url)) continue;
-            seen.add(hit.url);
-            hits.push(hit);
-          }
-        }
-        if (hits.length === 0) {
-          return {
-            content: [{ type: "text", text: "没有找到结果。" }],
-            details: { query: queries, count: 0 },
-          };
-        }
-
-        return {
-          content: [{ type: "text", text: JSON.stringify(hits, null, 2) }],
-          details: {
-            query: queries,
-            provider: "search1api",
-            count: hits.length,
-            results: hits,
-          },
-        };
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return {
-          isError: true,
-          content: [{ type: "text", text: `搜索失败: ${message}` }],
-          details: { error: message },
-        };
-      }
-    },
-  });
-
-  pi.registerTool({
-    name: "web_fetch",
-    label: "Web Fetch",
-    description:
-      "Fetch a URL and return its content as markdown (HTML pages) or raw text " +
-      "(JSON/XML/plain-text API responses). SSRF-protected: refuses private/internal " +
-      "addresses.",
-    promptSnippet: "Fetch a web page or API response",
-    parameters: Type.Object({
-      url: Type.String({ description: "The URL to fetch" }),
-    }),
-    async execute(_id, params, signal) {
-      try {
-        const page = await fetchPage(params.url, signal);
-        const { text, truncated } = truncateMarkdown(page.markdown);
-        const details: Record<string, unknown> = {
-          url: page.url,
-          title: page.title,
-          bytes: Buffer.byteLength(page.markdown, "utf8"),
-          truncated,
-        };
-        return {
-          content: [{ type: "text", text }],
-          details,
-        };
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        const details: Record<string, unknown> = { error: message, url: params.url };
-        return {
-          isError: true,
-          content: [{ type: "text", text: `抓取失败: ${message}` }],
-          details,
-        };
-      }
-    },
-  });
-}