@xl0/pi-lovely-web 0.1.2 → 0.1.4

package/README.md

@@ -42,21 +42,21 @@ The plain-text tool output looks likes this:
 - `web_fetch` - The single web page in markdown format
 - `web_image` - The single image, returned as media content. Respects the Pi image resizing settings:
 
-![web_image](assets/web_image.png)
+![web_image](https://raw.githubusercontent.com/xl0/pi-lovely-web/master/assets/web_image.png)
 
 
 ## Configuration
 
 Run `/lovely-web` in Pi to configure providers interactively:
 
-![alt text](assets/settings.png)
+![settings](https://raw.githubusercontent.com/xl0/pi-lovely-web/master/assets/settings.png)
 
 The settings are stored in `~/.pi/agent/xl0-pi-lovely-web.json` (global) or `.pi/xl0-pi-lovely-web.json` (project):
 
 ```json
 {
-  "webSearch": { "provider": "firecrawl", "enabled": true },
-  "webFetch":  { "provider": "firecrawl", "enabled": true },
+  "webSearch": { "provider": "firecrawl" },
+  "webFetch":  { "provider": "firecrawl" },
   "webImage":  { "enabled": true },
   "webApiKeys": {
     "firecrawl": "fc-...",
@@ -69,9 +69,9 @@ The settings are stored in `~/.pi/agent/xl0-pi-lovely-web.json` (global) or `.pi
 
 API keys can also be set via environment variables: `FIRECRAWL_API_KEY`, `EXA_API_KEY`, `TAVILY_API_KEY`, `BRAVE_API_KEY`.
 
-Search and fetch can use different providers. If only `webSearch.provider` is set,
-`web_fetch` falls back to it when that provider supports fetch. Set `enabled:false`
-on `webSearch`, `webFetch`, or `webImage` to remove that tool from Pi's active tool list.
+Search and fetch default to Firecrawl and can use different providers. Set `provider:null`
+on `webSearch` or `webFetch` to remove that tool from Pi's active tool list. Set
+`webImage.enabled:false` to disable `web_image`.
 
 `waitFor` is provider-specific: Firecrawl supports it as an extra pre-capture delay; Exa and Tavily ignore it and `web_fetch` returns a warning if supplied.
 

package/extensions/lovely-web/command.ts

@@ -4,6 +4,7 @@ import { type ExtensionAPI, ExtensionInputComponent, getSelectListTheme, getSett
 import { Container, SelectList, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui"
 import {
 	applyToolConfig,
+	DEFAULT_PROVIDER_ID,
 	DISABLED_LABEL,
 	getImageMaxSize,
 	isFetchEnabled,
@@ -68,14 +69,14 @@ export function registerLovelyWebCommand(pi: ExtensionAPI) {
 					{
 						id: "search",
 						label: "web_search",
-						currentValue: isSearchEnabled(config) ? providerLabel(config.webSearch?.provider) : DISABLED_LABEL,
+						currentValue: isSearchEnabled(config) ? providerLabel(config.webSearch?.provider ?? DEFAULT_PROVIDER_ID) : DISABLED_LABEL,
 						description: "Search provider, or disabled to remove web_search from active tools.",
 						submenu: (currentValue, done) => providerSubmenu("Select search provider", searchLabels, currentValue, done)
 					},
 					{
 						id: "fetch",
 						label: "web_fetch",
-						currentValue: isFetchEnabled(config) ? providerLabel(config.webFetch?.provider) : DISABLED_LABEL,
+						currentValue: isFetchEnabled(config) ? providerLabel(config.webFetch?.provider ?? DEFAULT_PROVIDER_ID) : DISABLED_LABEL,
 						description: "Fetch provider, or disabled to remove web_fetch from active tools.",
 						submenu: (currentValue, done) => providerSubmenu("Select fetch provider", fetchLabels, currentValue, done)
 					},
@@ -89,9 +90,9 @@ export function registerLovelyWebCommand(pi: ExtensionAPI) {
 					{
 						id: "image-resize",
 						label: "Resize images",
-						currentValue: isImageResizeEnabled(config) ? "enabled" : "disabled",
+						currentValue: isImageResizeEnabled(config) ? "on" : "off",
 						description: "Resize fetched images to fit within the max size limit.",
-						values: ["enabled", "disabled"]
+						values: ["on", "off"]
 					},
 					{
 						id: "image-max-size",
@@ -145,21 +146,21 @@ export function registerLovelyWebCommand(pi: ExtensionAPI) {
 					getSettingsListTheme(),
 					(id, newValue) => {
 						if (id === "search") {
-							if (newValue === DISABLED_LABEL) config.webSearch = { ...config.webSearch, enabled: false }
+							if (newValue === DISABLED_LABEL) config.webSearch = { provider: null }
 							else {
 								const providerId = providerIdFromLabel(newValue)
-								if (providerId) config.webSearch = { provider: providerId, enabled: true }
+								if (providerId) config.webSearch = { provider: providerId }
 							}
 						} else if (id === "fetch") {
-							if (newValue === DISABLED_LABEL) config.webFetch = { ...config.webFetch, enabled: false }
+							if (newValue === DISABLED_LABEL) config.webFetch = { provider: null }
 							else {
 								const providerId = providerIdFromLabel(newValue)
-								if (providerId) config.webFetch = { provider: providerId, enabled: true }
+								if (providerId) config.webFetch = { provider: providerId }
 							}
 						} else if (id === "image") {
 							config.webImage = { ...config.webImage, enabled: newValue === "enabled" }
 						} else if (id === "image-resize") {
-							config.webImage = { ...config.webImage, resize: newValue === "enabled" }
+							config.webImage = { ...config.webImage, resize: newValue === "on" }
 						}
 						save()
 					},

package/extensions/lovely-web/config.ts

@@ -9,6 +9,7 @@ import { tavilyProvider } from "./providers/tavily.js"
 import type { Provider, WebToolsConfig } from "./providers/types.js"
 
 export const DEFAULT_TIMEOUT_MS = 30_000
+export const DEFAULT_PROVIDER_ID = "firecrawl"
 export const DISABLED_LABEL = "Disabled"
 
 export const providers: Record<string, Provider> = {
@@ -21,11 +22,11 @@ export const providers: Record<string, Provider> = {
 export const providerNames = Object.keys(providers)
 
 export function isSearchEnabled(config: WebToolsConfig): boolean {
-	return config.webSearch?.enabled !== false
+	return config.webSearch?.provider !== null
 }
 
 export function isFetchEnabled(config: WebToolsConfig): boolean {
-	return config.webFetch?.enabled !== false
+	return config.webFetch?.provider !== null
 }
 
 export function isImageEnabled(config: WebToolsConfig): boolean {
@@ -46,11 +47,7 @@ function resolveProviderId(type: "search" | "fetch", config: WebToolsConfig): st
 
 	const direct = type === "search" ? config.webSearch?.provider : config.webFetch?.provider
 	const fallback = type === "fetch" && isSearchEnabled(config) ? config.webSearch?.provider : undefined
-	const id = direct || fallback
-	if (!id) {
-		const hint = type === "search" ? "webSearch.provider" : "webFetch.provider"
-		throw new Error(`No ${type} provider configured. Set ${hint} via /lovely-web.`)
-	}
+	const id = direct ?? fallback ?? DEFAULT_PROVIDER_ID
 	if (!providers[id]) throw new Error(`Unknown provider "${id}". Available: ${Object.keys(providers).join(", ")}.`)
 	return id
 }
@@ -83,8 +80,8 @@ export function loadConfig(cwd: string): WebToolsConfig {
 	return {
 		...global,
 		...project,
-		webSearch: { ...global.webSearch, ...project.webSearch },
-		webFetch: { ...global.webFetch, ...project.webFetch },
+		webSearch: { provider: DEFAULT_PROVIDER_ID, ...global.webSearch, ...project.webSearch },
+		webFetch: { provider: DEFAULT_PROVIDER_ID, ...global.webFetch, ...project.webFetch },
 		webImage: { ...global.webImage, ...project.webImage },
 		webApiKeys: { ...global.webApiKeys, ...project.webApiKeys }
 	}

package/extensions/lovely-web/providers/types.ts

@@ -24,8 +24,8 @@ export interface Provider {
 }
 
 export interface WebToolsConfig {
-	webSearch?: { provider?: string; enabled?: boolean }
-	webFetch?: { provider?: string; enabled?: boolean }
+	webSearch?: { provider?: string | null }
+	webFetch?: { provider?: string | null }
 	webImage?: { enabled?: boolean; resize?: boolean; maxSize?: number }
 	webApiKeys?: Record<string, string>
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xl0/pi-lovely-web",
-	"version": "0.1.2",
+	"version": "0.1.4",
 	"keywords": [
 		"pi-package",
 		"firecrawl",
@@ -49,6 +49,7 @@
 	"pi": {
 		"extensions": [
 			"./extensions"
-		]
+		],
+		"image": "https://raw.githubusercontent.com/xl0/pi-lovely-web/master/assets/web_image.png"
 	}
 }