@mrclrchtr/supi-web 4.7.0 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-web",
-  "version": "4.7.0",
+  "version": "4.9.0",
   "description": "Public web pages to Markdown, plus focused Context7 docs",
   "license": "MIT",
   "repository": {
@@ -35,12 +35,8 @@
     "jsdom": "^30.0.0",
     "@mozilla/readability": "^0.6.0",
     "turndown": "^7.2.0",
-    "turndown-plugin-gfm": "^1.0.2",
-    "@mrclrchtr/supi-core": "4.7.0"
+    "turndown-plugin-gfm": "^1.0.2"
   },
-  "bundledDependencies": [
-    "@mrclrchtr/supi-core"
-  ],
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",

package/src/api.ts

@@ -4,7 +4,6 @@
 
 export type { Context7RequestOptions } from "./context7-client.ts";
 export { htmlToMarkdown, wrapAsCodeBlock } from "./convert.ts";
-export { default as docsExtension } from "./docs.ts";
 export {
   FetchError,
   type FetchOptions,
@@ -21,4 +20,3 @@ export {
   type WebFetchMdInput,
   type WebToolName,
 } from "./tool/tool-specs.ts";
-export { default } from "./web.ts";

package/src/fetch.ts

@@ -6,6 +6,8 @@
 const USER_AGENT = "Mozilla/5.0 (compatible; supi-web/1.0; +https://github.com/mrclrchtr/supi)";
 const ACCEPT_SIBLING = "text/markdown,text/plain;q=0.9,*/*;q=0.1";
 const DEFAULT_TIMEOUT_MS = 30_000;
+/** Largest timeout accepted by {@link AbortSignal.timeout}. */
+export const FETCH_TIMEOUT_MAX_MS = 4_294_967_295;
 const SNIFF_BYTES = 8192;
 
 /** Validated URL result. */
@@ -24,6 +26,7 @@ export interface FetchResult {
 
 /** Fetch options. */
 export interface FetchOptions {
+  /** Integer timeout from 0 through 4,294,967,295 milliseconds. */
   timeoutMs?: number;
   signal?: AbortSignal;
 }
@@ -38,12 +41,17 @@ export function isValidHttpUrl(url: string): boolean {
   }
 }
 
-/** Fetch a URL with full content negotiation and sniffing. */
+/**
+ * Fetch a URL with full content negotiation and sniffing.
+ *
+ * Parent cancellation keeps its reason. Request timeouts throw {@link FetchError}.
+ */
 export async function fetchWithNegotiation(
   url: string,
   options: FetchOptions = {},
 ): Promise<FetchResult> {
   const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  validateTimeoutMs(timeoutMs);
   const { signal } = options;
 
   // 1. Try HEAD negotiation for Markdown
@@ -297,31 +305,30 @@ export class FetchError extends Error {
   }
 }
 
+function validateTimeoutMs(timeoutMs: number): void {
+  if (!Number.isInteger(timeoutMs) || timeoutMs < 0 || timeoutMs > FETCH_TIMEOUT_MAX_MS) {
+    throw new FetchError(
+      `Fetch timeout must be an integer from 0 through ${FETCH_TIMEOUT_MAX_MS}ms`,
+    );
+  }
+}
+
 async function timedFetch(
   url: string,
   init: RequestInit,
   timeoutMs: number,
   signal?: AbortSignal,
 ): Promise<Response> {
-  const controller = new AbortController();
-  let timedOut = false;
-  const abortFromParent = () => controller.abort();
-  if (signal?.aborted) abortFromParent();
-  else signal?.addEventListener("abort", abortFromParent, { once: true });
-
-  const timer = setTimeout(() => {
-    timedOut = true;
-    controller.abort();
-  }, timeoutMs);
+  const timeoutSignal = AbortSignal.timeout(timeoutMs);
+  const fetchSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
 
   try {
-    return await fetch(url, { ...init, signal: controller.signal });
+    return await fetch(url, { ...init, signal: fetchSignal });
   } catch (err) {
-    if (timedOut) throw new FetchError(`Fetch timed out after ${timeoutMs}ms`, { cause: err });
+    if (timeoutSignal.aborted && fetchSignal.reason === timeoutSignal.reason) {
+      throw new FetchError(`Fetch timed out after ${timeoutMs}ms`, { cause: err });
+    }
     throw err;
-  } finally {
-    clearTimeout(timer);
-    signal?.removeEventListener("abort", abortFromParent);
   }
 }
 

package/src/tool/tool-specs.ts

@@ -1,5 +1,6 @@
 import { StringEnum } from "@earendil-works/pi-ai";
 import { type Static, type TSchema, Type } from "typebox";
+import { FETCH_TIMEOUT_MAX_MS } from "../fetch.ts";
 import { MODEL_OUTPUT_LIMIT_DESCRIPTION } from "./output.ts";
 
 export const WEB_FETCH_MD_TOOL_NAME = "web_fetch_md";
@@ -27,7 +28,14 @@ const WebFetchMdParameters = Type.Object(
     url: Type.String({ description: "Public http(s) URL" }),
     output_mode: Type.Optional(OutputModeEnum),
     abs_links: Type.Optional(Type.Boolean({ description: "Absolute links/images", default: true })),
-    timeout_ms: Type.Optional(Type.Number({ description: "Fetch timeout (ms)", default: 30_000 })),
+    timeout_ms: Type.Optional(
+      Type.Integer({
+        description: "Fetch timeout (ms)",
+        default: 30_000,
+        minimum: 0,
+        maximum: FETCH_TIMEOUT_MAX_MS,
+      }),
+    ),
   },
   { additionalProperties: false },
 );

package/node_modules/@mrclrchtr/supi-core/README.md

@@ -1,120 +0,0 @@
-<div align="center">
-  <a href="https://github.com/mrclrchtr/supi/tree/main/packages/supi-core">
-    <img src="https://raw.githubusercontent.com/mrclrchtr/supi/main/packages/supi-core/assets/social-preview.png" alt="SuPi Core" width="100%">
-  </a>
-</div>
-
-# @mrclrchtr/supi-core
-
-Shared infrastructure for SuPi extensions.
-
-This is a **pure library** — it does not register any pi commands or tools. The `/supi-settings` command is now available through `@mrclrchtr/supi-settings`.
-
-## Install
-
-```bash
-pnpm add @mrclrchtr/supi-core
-```
-
-## Package surfaces
-
-- `@mrclrchtr/supi-core/api` — reusable helpers for other packages and extensions
-- `@mrclrchtr/supi-core/report` — shared text/report rendering helpers for TUI and plain-text summaries
-
-## What you get from the API
-
-### Config helpers
-
-- `loadSupiConfig()` — merged config with resolution order `defaults <- global <- project`
-- `loadSupiConfigForScope()` — load one scope at a time for settings UIs
-- `writeSupiConfig()` — persist values
-- `removeSupiConfigKey()` — remove a key or override
-
-Config file locations:
-
-- global: `~/.pi/agent/supi/config.json`
-- project: `.pi/supi/config.json`
-
-### Settings helpers
-
-- `registerDeclarativeSettings(pi, options)` — contribute a config-backed declarative settings section with source-aware scoped persistence
-- `registerSettingsCommand(pi)` — register `/supi-settings` (used by `@mrclrchtr/supi-settings`)
-- `openSettingsOverlay(pi, ctx)` — open the shared settings UI directly
-- `createInputSubmenu()` — helper for simple text-entry submenus
-- `createModelPickerSubmenu()` — helper for scoped model selection submenus, with optional host-owned choices and `disabled` control
-
-The built-in settings UI supports:
-
-- project/global scope toggle
-- source badges for project, global, and default values
-- Inherit/Reset actions that delete scoped config keys
-- grouped extension sections
-- searchable setting lists
-
-### Context helpers
-
-- `wrapExtensionContext()` — wrap injected text in SuPi's `<extension-context>` tag
-- `findLastUserMessageIndex()`
-- `getContextToken()`
-- `getPromptContent()`
-- `pruneAndReorderContextMessages()`
-- `restorePromptContent()`
-
-### Shared registries
-
-- context-provider registry for `/supi-context`
-- debug-event registry for producers that want shared debug capture
-- settings registry used by `/supi-settings`
-
-### Project and session helpers
-
-- project-root detection and directory walking helpers such as `findProjectRoot()` and `walkProject()`
-- active-branch session helper: `getActiveBranchEntries()`
-- terminal helpers such as `formatTitle()`, `signalWaiting()`, and `signalDone()`
-
-### Report helpers
-
-- `clampReportWidth()` — enforce a minimum readable report width
-- `formatReportTitle()` / `formatSectionHeader()` — shared themed headers
-- `formatDimLine()` / `formatKeyValueLine()` — common summary rows
-- `formatOverflowHint()` — consistent preview-overflow hints
-- `wrapReportText()` — ANSI-aware wrapped report blocks with optional indentation
-
-## Example
-
-```ts
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { loadSupiConfig, registerDeclarativeSettings, wrapExtensionContext } from "@mrclrchtr/supi-core/api";
-
-export default function myExtension(pi: ExtensionAPI) {
-  const defaults = { enabled: true };
-  const config = loadSupiConfig("my-extension", process.cwd(), defaults);
-
-  registerDeclarativeSettings(pi, {
-    id: "my-extension",
-    label: "My Extension",
-    section: "my-extension",
-    defaults,
-    fields: [
-      {
-        kind: "boolean" as const,
-        key: "enabled",
-        label: "Enabled",
-      },
-    ],
-  });
-
-  const message = wrapExtensionContext("my-extension", "hello", {
-    enabled: config.enabled,
-  });
-  void message;
-}
-```
-
-## Source
-
-- `src/api.ts` — exported library surface
-- `src/config.ts` — shared config loading and writing
-- `src/config-settings.ts` — config-backed settings registration helper
-- `src/settings-ui.ts` — shared settings overlay
-- `src/report.ts` — shared text/report rendering helpers

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,75 +0,0 @@
-{
-  "name": "@mrclrchtr/supi-core",
-  "version": "4.7.0",
-  "description": "Shared settings, configuration, reporting, and session infrastructure",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mrclrchtr/supi.git",
-    "directory": "packages/supi-core"
-  },
-  "homepage": "https://github.com/mrclrchtr/supi/tree/main/packages/supi-core#readme",
-  "bugs": {
-    "url": "https://github.com/mrclrchtr/supi/issues"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "pi",
-    "pi-coding-agent",
-    "supi",
-    "extension-utils",
-    "settings",
-    "configuration"
-  ],
-  "type": "module",
-  "files": [
-    "src/**/*.ts",
-    "!__tests__"
-  ],
-  "peerDependencies": {
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
-    "typebox": "*"
-  },
-  "peerDependenciesMeta": {
-    "@earendil-works/pi-ai": {
-      "optional": true
-    },
-    "@earendil-works/pi-coding-agent": {
-      "optional": true
-    },
-    "@earendil-works/pi-tui": {
-      "optional": true
-    },
-    "typebox": {
-      "optional": true
-    }
-  },
-  "main": "src/api.ts",
-  "exports": {
-    "./api": "./src/api.ts",
-    "./config": "./src/config.ts",
-    "./context": "./src/context.ts",
-    "./debug": "./src/debug-registry.ts",
-    "./evidence-badge": "./src/evidence-badge.ts",
-    "./footer-registry": "./src/footer-registry.ts",
-    "./llm": "./src/llm.ts",
-    "./model-selection": "./src/model-selection.ts",
-    "./package.json": "./package.json",
-    "./path": "./src/path.ts",
-    "./report": "./src/report.ts",
-    "./progress-widget": "./src/progress-widget.ts",
-    "./project": "./src/project.ts",
-    "./session": "./src/session.ts",
-    "./settings": "./src/settings.ts",
-    "./settings-ui": "./src/settings-ui.ts",
-    "./spinner-frames": "./src/spinner-frames.ts",
-    "./status-spinner": "./src/status-spinner.ts",
-    "./terminal": "./src/terminal.ts",
-    "./tool-framework": "./src/tool-framework.ts",
-    "./prompt-surface": "./src/prompt-surface.ts"
-  }
-}

package/node_modules/@mrclrchtr/supi-core/src/api.ts

@@ -1,42 +0,0 @@
-// supi-core — shared infrastructure for SuPi extensions.
-// Provides XML context tag wrapping, unified config system, context-message utilities,
-// settings registry for supi-wide TUI settings, and a shared tool-spec/registration framework.
-//
-// Convenience barrel — re-exports all domain entry points.
-// For lighter imports, use one of the domain subpaths directly
-// (e.g. @mrclrchtr/supi-core/config, @mrclrchtr/supi-core/context).
-
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./config.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./context.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./debug-registry.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./evidence-badge.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./footer-registry.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./llm.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./model-selection.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./path.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./project.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./report.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./session.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./settings.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./settings-ui.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./spinner-frames.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./status-spinner.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./terminal.ts";
-// biome-ignore lint/performance/noReExportAll: intentional convenience barrel
-export * from "./tool-framework.ts";

package/node_modules/@mrclrchtr/supi-core/src/config/config.ts

@@ -1,221 +0,0 @@
-// Shared config system for SuPi extensions.
-//
-// Global config: ~/.pi/agent/supi/config.json
-// Project config: .pi/supi/config.json (relative to cwd)
-// Resolution: hardcoded defaults ← global ← project
-
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
-
-const GLOBAL_CONFIG_DIR = `${CONFIG_DIR_NAME}/agent/supi`;
-const PROJECT_CONFIG_DIR = `${CONFIG_DIR_NAME}/supi`;
-const CONFIG_FILE = "config.json";
-
-function getGlobalConfigPath(homeDir?: string): string {
-  return path.join(homeDir ?? os.homedir(), GLOBAL_CONFIG_DIR, CONFIG_FILE);
-}
-
-function getProjectConfigPath(cwd: string): string {
-  return path.join(cwd, PROJECT_CONFIG_DIR, CONFIG_FILE);
-}
-
-/** Return the SuPi config file path for one scope. */
-export function getSupiConfigPath(
-  scope: "global" | "project",
-  cwd: string,
-  options?: SupiConfigOptions,
-): string {
-  return scope === "global" ? getGlobalConfigPath(options?.homeDir) : getProjectConfigPath(cwd);
-}
-
-export function readJsonFile(filePath: string): Record<string, unknown> | null {
-  let content: string;
-  try {
-    content = fs.readFileSync(filePath, "utf-8");
-  } catch {
-    // ENOENT or permission error — silent, file may not exist
-    return null;
-  }
-
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(content);
-  } catch {
-    // biome-ignore lint/suspicious/noConsole: deliberate config parse warning
-    console.warn(`[supi-core] Failed to parse config file, ignoring: ${filePath}`);
-    return null;
-  }
-
-  if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-    return parsed as Record<string, unknown>;
-  }
-
-  // biome-ignore lint/suspicious/noConsole: deliberate config parse warning
-  console.warn(`[supi-core] Config file root is not an object, ignoring: ${filePath}`);
-  return null;
-}
-
-function shallowMerge<T>(base: T, ...overrides: Array<Record<string, unknown> | null>): T {
-  let result = { ...base };
-  for (const override of overrides) {
-    if (!override) continue;
-    result = { ...result, ...override };
-  }
-  return result;
-}
-
-export interface SupiConfigOptions {
-  homeDir?: string;
-}
-
-/**
- * Load and merge config for a given extension section.
- *
- * Resolution order: defaults ← global ← project
- */
-export function loadSupiConfig<T>(
-  section: string,
-  cwd: string,
-  defaults: T,
-  options?: SupiConfigOptions,
-): T {
-  const globalConfig = readJsonFile(getGlobalConfigPath(options?.homeDir));
-  const projectConfig = readJsonFile(getProjectConfigPath(cwd));
-
-  const globalSection = extractSection(globalConfig, section);
-  const projectSection = extractSection(projectConfig, section);
-
-  return shallowMerge(defaults, globalSection, projectSection);
-}
-
-/**
- * Load config for a single scope only.
- *
- * Resolution order: defaults ← selected scope
- *
- * This is useful for settings UIs that need to show the raw values stored in
- * one scope, rather than the effective merged config.
- */
-export function loadSupiConfigForScope<T>(
-  section: string,
-  cwd: string,
-  defaults: T,
-  options: { scope: "global" | "project" } & SupiConfigOptions,
-): T {
-  const config = readJsonFile(getSupiConfigPath(options.scope, cwd, { homeDir: options.homeDir }));
-
-  const scopedSection = extractSection(config, section);
-  return shallowMerge(defaults, scopedSection);
-}
-
-/** Load the raw object for one config section and one scope. */
-export function loadSupiConfigSectionForScope(
-  section: string,
-  cwd: string,
-  options: { scope: "global" | "project" } & SupiConfigOptions,
-): Record<string, unknown> | null {
-  const config = readJsonFile(getSupiConfigPath(options.scope, cwd, { homeDir: options.homeDir }));
-  return extractSection(config, section);
-}
-
-export interface SupiConfigLocation {
-  section: string;
-  scope: "global" | "project";
-  cwd: string;
-}
-
-/**
- * Write config values for a given extension section.
- */
-export function writeSupiConfig(
-  loc: SupiConfigLocation,
-  value: Record<string, unknown>,
-  options?: SupiConfigOptions,
-): void {
-  const configPath = getSupiConfigPath(loc.scope, loc.cwd, options);
-
-  const dir = path.dirname(configPath);
-  fs.mkdirSync(dir, { recursive: true });
-
-  const existing = readJsonFile(configPath) ?? {};
-  existing[loc.section] = {
-    ...((existing[loc.section] as Record<string, unknown>) ?? {}),
-    ...value,
-  };
-
-  fs.writeFileSync(configPath, `${JSON.stringify(existing, null, 2)}\n`, "utf-8");
-}
-
-/**
- * Remove a key from a config section.
- * Used by `interval default` to remove the project override.
- */
-export function removeSupiConfigKey(
-  loc: SupiConfigLocation,
-  key: string,
-  options?: SupiConfigOptions,
-): void {
-  const configPath = getSupiConfigPath(loc.scope, loc.cwd, options);
-
-  const existing = readJsonFile(configPath);
-  if (!existing) return;
-
-  const sectionData = existing[loc.section] as Record<string, unknown> | undefined;
-  if (!sectionData) return;
-
-  delete sectionData[key];
-
-  if (Object.keys(sectionData).length === 0) {
-    delete existing[loc.section];
-  }
-
-  const dir = path.dirname(configPath);
-  fs.mkdirSync(dir, { recursive: true });
-
-  const content = Object.keys(existing).length > 0 ? `${JSON.stringify(existing, null, 2)}\n` : "";
-
-  if (content) {
-    // Directory guaranteed to exist since we just read from it
-    fs.writeFileSync(configPath, content, "utf-8");
-  } else {
-    try {
-      fs.unlinkSync(configPath);
-    } catch {
-      // File may not exist
-    }
-  }
-}
-
-function extractSection(
-  config: Record<string, unknown> | null,
-  section: string,
-): Record<string, unknown> | null {
-  if (!config) return null;
-  const data = config[section];
-  if (typeof data === "object" && data !== null && !Array.isArray(data)) {
-    return data as Record<string, unknown>;
-  }
-  return null;
-}
-
-/**
- * Shorthand for {@link loadSupiConfig} that infers the return type from defaults.
- *
- * Reduces boilerplate when a package only needs the merged runtime config.
- *
- * @example
- * ```ts
- * const config = loadSectionConfig("my-ext", cwd, { enabled: true, timeout: 30 });
- * // config is typed as { enabled: boolean; timeout: number }
- * ```
- */
-export function loadSectionConfig<T extends Record<string, unknown>>(
-  section: string,
-  cwd: string,
-  defaults: T,
-  options?: SupiConfigOptions,
-): T {
-  return loadSupiConfig(section, cwd, defaults, options);
-}