@zeldrisho/pi-web-fetch 0.16.0 → 0.16.1

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.16.1] - 2026-10-28
+
+### Changed
+
+- Show focus queries in tool calls, and display expansion and continuation notices with clearer spacing.
+
 ## [0.16.0] - 2026-10-28
 
 ### Added
@@ -295,7 +301,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add bounded public page fetching ([b979496](https://github.com/zeldrisho/pi-packages/commit/b979496b32de1cead172ba570307e4a4a7b3421d))
 
-[Unreleased]: https://github.com/zeldrisho/pi-packages/compare/pi-web-fetch-v0.16.0...HEAD
+[Unreleased]: https://github.com/zeldrisho/pi-packages/compare/pi-web-fetch-v0.16.1...HEAD
+[0.16.1]: https://github.com/zeldrisho/pi-packages/compare/pi-web-fetch-v0.16.0...pi-web-fetch-v0.16.1
 [0.16.0]: https://github.com/zeldrisho/pi-packages/compare/pi-web-fetch-v0.15.0...pi-web-fetch-v0.16.0
 [0.15.0]: https://github.com/zeldrisho/pi-packages/compare/pi-web-fetch-v0.14.1...pi-web-fetch-v0.15.0
 [0.14.1]: https://github.com/zeldrisho/pi-packages/compare/pi-web-fetch-v0.14.0...pi-web-fetch-v0.14.1

package/README.md

@@ -25,7 +25,7 @@ The `web_fetch` tool accepts public HTTP and HTTPS URLs and supports HTML, Markd
 
 Output is bounded to 6,000 characters by default. For long pages, use the returned `nextOffset` to continue. Use `query` to focus on matching sections, or omit it to read the complete document. Pi's preview is collapsed by default; press `Ctrl+O` to expand it.
 
-For example, a URL such as `https://github.com/shadcn-ui/lint#get-started` starts at the matching heading. GitHub `blob` links and bare gists are converted to raw source URLs; repository roots use their README. GitHub directory listings are not supported.
+For example, a URL such as `https://github.com/zeldrisho/pi-packages/blob/main/packages/pi-web-fetch/README.md#usage` starts at the matching heading. GitHub `blob` links and bare gists are converted to raw source URLs; repository roots use their README. GitHub directory listings are not supported.
 
 ### Page alternatives and bot challenges
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeldrisho/pi-web-fetch",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Pi extension for secure, bounded public web page fetching and Markdown extraction",
   "keywords": [
     "pi",

package/src/cache.ts

@@ -39,6 +39,26 @@ export function stableKeyHash(key: string): string {
   return createHash("sha256").update(key).digest("hex");
 }
 
+/** Hash canonical JSON, sorting object keys recursively while preserving array order. */
+// oxlint-disable-next-line anti-slop/no-unknown-parameters -- JSON serialization defines the accepted values.
+export function canonicalKey(value: unknown): string {
+  // oxlint-disable-next-line anti-slop/no-unknown-parameters -- JSON replacer receives arbitrary JSON values.
+  const json = JSON.stringify(value, (_key, entry: unknown) => {
+    // oxlint-disable-next-line anti-slop/no-runtime-typeof -- recursively sort JSON objects.
+    if (entry !== null && typeof entry === "object" && !Array.isArray(entry)) {
+      return Object.fromEntries(
+        Object.entries(entry).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)),
+      );
+    }
+
+    return entry;
+  });
+
+  if (json === undefined) throw new TypeError("Cache key must be JSON serializable");
+
+  return stableKeyHash(json);
+}
+
 /**
  * Resolves a cache entry's on-disk path and refuses to escape the cache
  * directory, guarding against a `keyToPath` that returns `..` segments. The

package/src/index.ts

@@ -1,5 +1,5 @@
-import { getMarkdownTheme, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { Markdown, Text } from "@earendil-works/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import {
   FETCH_MAX_OFFSET_CHARACTERS,
@@ -7,7 +7,7 @@ import {
   FETCH_MAX_URL_CHARACTERS,
 } from "./limits";
 import { redactUrlForDisplay } from "./redact";
-import { formatCollapsibleOutput } from "./render";
+import { renderCollapsibleOutput } from "./render";
 import { executeWebFetch, webFetchOutputSchema, type WebFetchDetails } from "./service";
 
 export { ExpiringLruCache } from "./cache";
@@ -108,7 +108,7 @@ export default function (pi: ExtensionAPI) {
     /** Renders the redacted URL, optional focus query, and character offset in the call preview. */
     renderCall(args, theme) {
       return new Text(
-        `${theme.fg("toolTitle", theme.bold("web_fetch"))} ${theme.fg("accent", redactUrlForDisplay(args.url))}`,
+        `${theme.fg("toolTitle", theme.bold("web_fetch"))} ${theme.fg("accent", redactUrlForDisplay(args.url))}${args.query === undefined ? "" : theme.fg("muted", ` query=${JSON.stringify(args.query)}`)}`,
         0,
         0,
       );
@@ -122,15 +122,21 @@ export default function (pi: ExtensionAPI) {
      * Renders partial text or "Fetching…" while pending. Completed text gets a
      * detail summary when available and a collapsible body; absent text shows "No content".
      */
-    renderResult(result, { expanded, isPartial }, theme) {
+    renderResult(result, { expanded, isPartial }, theme, context) {
       const content = result.content.find((item) => item.type === "text");
 
       if (isPartial) return new Text(theme.fg("warning", content?.text || "Fetching…"), 0, 0);
 
       return content?.type === "text"
-        ? new Markdown(formatCollapsibleOutput(content.text, expanded), 0, 0, getMarkdownTheme(), {
-            color: (text) => theme.fg("toolOutput", text),
-          })
+        ? renderCollapsibleOutput(
+            content.text,
+            expanded,
+            theme,
+            context?.isError,
+            result.details?.truncated && result.details.nextOffset !== undefined
+              ? `[Content truncated. Continue with offset=${result.details.nextOffset} to read the next chunk.]`
+              : undefined,
+          )
         : new Text(theme.fg("dim", "No content"), 0, 0);
     },
   });

package/src/render.ts

@@ -1,21 +1,46 @@
-import { keyHint } from "@earendil-works/pi-coding-agent";
+import { getMarkdownTheme, keyHint } from "@earendil-works/pi-coding-agent";
+import { Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 
 const COLLAPSED_LINES = 10;
 
-/** Format tool output using Pi's built-in collapsed-preview convention. */
-export function formatCollapsibleOutput(output: string, expanded: boolean): string {
+/** Render document content separately from Pi-style interface notices. */
+export function renderCollapsibleOutput(
+  output: string,
+  expanded: boolean,
+  theme: { fg(color: "toolOutput" | "muted" | "warning", text: string): string },
+  isError = false,
+  warning?: string,
+): Container {
   const lines = output.replace(/\r\n/g, "\n").split("\n");
 
   while (lines.at(-1) === "") lines.pop();
-  const totalLines = lines.length;
-  const visibleLines = expanded ? lines : lines.slice(0, COLLAPSED_LINES);
-  let text = visibleLines.join("\n");
+  const visible = expanded ? lines : lines.slice(0, COLLAPSED_LINES);
+  const remaining = lines.length - visible.length;
+  const component = new Container();
+  const body = `\n${visible.join("\n")}`;
 
-  const remaining = totalLines - visibleLines.length;
+  component.addChild(
+    isError
+      ? new Text(theme.fg("toolOutput", body), 0, 0)
+      : new Markdown(body, 0, 0, getMarkdownTheme(), {
+          color: (text) => theme.fg("toolOutput", text),
+        }),
+  );
 
   if (remaining > 0) {
-    text += `\n... (${remaining} more lines, ${totalLines} total, ${keyHint("app.tools.expand", "to expand")})`;
+    component.addChild(
+      new Text(
+        `${theme.fg("muted", `... (${remaining} more lines, ${lines.length} total,`)} ${keyHint("app.tools.expand", "to expand")}${theme.fg("muted", ")")}`,
+        0,
+        0,
+      ),
+    );
   }
 
-  return `\n${text}`;
+  if (warning) {
+    component.addChild(new Spacer(1));
+    component.addChild(new Text(theme.fg("warning", warning), 0, 0));
+  }
+
+  return component;
 }

package/src/service.ts

@@ -8,7 +8,7 @@ import {
   truncateHead,
   type AgentToolResult,
 } from "@earendil-works/pi-coding-agent";
-import { ExpiringLruCache, stableKeyHash, type CachePersistence } from "./cache";
+import { ExpiringLruCache, stableKeyHash, canonicalKey, type CachePersistence } from "./cache";
 import { sliceCompleteDocument, type CompleteDocument } from "./document/content.ts";
 import { revalidateCompleteDocument, type FetchRemoteDependencies } from "./acquisition/fetch.ts";
 import { fetchDocumentWithLlmsTxtSupport } from "./acquisition/llms.ts";
@@ -430,7 +430,8 @@ export async function executeWebFetch(
 
   const displayRequestedUrl = redactUrlForDisplay(params.url);
   const sourceUrl = urlWithoutFragment(params.url);
-  let document = fetchCache.get(sourceUrl);
+  const cacheKey = canonicalKey({ url: sourceUrl });
+  let document = fetchCache.get(cacheKey);
   const now = Date.now();
 
   const fresh = Boolean(
@@ -459,7 +460,7 @@ export async function executeWebFetch(
     const stale = document;
 
     const acquisition = await inflightFetches.run(
-      sourceUrl,
+      cacheKey,
       async (sharedSignal) => {
         let fetched: CompleteDocument;
         let acquisitionStatus: FetchAcquisition["cacheStatus"] = "miss";
@@ -479,7 +480,7 @@ export async function executeWebFetch(
         }
 
         if (!fetched.extractionDiagnostics?.botWall) {
-          fetchCache.set(sourceUrl, fetched, Date.now() + CACHE_STALE_RETENTION_MS);
+          fetchCache.set(cacheKey, fetched, Date.now() + CACHE_STALE_RETENTION_MS);
         }
 
         return { document: fetched, cacheStatus: acquisitionStatus };