@yandy0725/pi-web-tools 0.1.0 → 0.3.0

package/README.md

@@ -1,14 +1,12 @@
 # pi-web-tools
 
-A [pi](https://pi.dev/docs/latest/packages) package providing web and image search tools for coding agents.
+A [pi](https://pi.dev/docs/latest/packages) package providing web search and web fetch tools for coding agents.
 
 ## Tools
 
 | Tool | Description | Source |
 |------|-------------|--------|
 | `web_search` | Pure web search, returns raw results (titles, URLs, snippets) | Exa (REST + MCP free tier) |
-| `deep_search` | Deep research with LLM-synthesized answers | Aliyun (Bailian) Chat Completions API |
-| `image_search` | Search images by text or find similar images by URL | Aliyun (Bailian) Responses API |
 | `web_fetch` | Fetch and convert web pages to text, markdown, or raw HTML | — |
 
 ## Quick Start
@@ -24,53 +22,16 @@ pi -e ./index.ts
 ### Prerequisites
 
 - `web_search`: No config needed — Exa MCP free tier (150 calls/day). Set `EXA_API_KEY` for higher limits.
-- `deep_search` / `image_search`: Set `ALIYUN_API_KEY` or use `/login` in pi to authenticate with Aliyun.
 
 ## Configuration
 
-Configuration uses two layers: environment variables for API keys, and a project config file for other settings.
+Configuration uses environment variables for API keys.
 
 ### API Keys (environment variables only)
 
 | Variable | Description | Default |
 |----------|-------------|---------|
 | `EXA_API_KEY` | Exa API key. If not set, uses MCP free tier (150 calls/day) | — |
-| `ALIYUN_API_KEY` | Aliyun (Bailian) API key | — |
-| `ALIYUN_BASE_URL` | Aliyun API base URL | `https://dashscope.aliyuncs.com/compatible-mode/v1` |
-| `ALIYUN_DEEP_SEARCH_MODEL` | Model for deep_search | `deepseek-v4-flash` |
-| `ALIYUN_IMAGE_SEARCH_MODEL` | Model for image_search | `qwen3.7-plus` |
-
-Aliyun also supports key resolution via pi's `/login` — if you've logged into Aliyun through pi, no env var needed.
-
-### Project Config (`.pi/agent/web-tools.json`)
-
-Create `.pi/agent/web-tools.json` in your project root for per-project settings:
-
-```json
-{
-  "aliyun": {
-    "baseUrl": "https://dashscope.aliyuncs.com/compatible-mode/v1",
-    "aliyunProviderKey": "aliyun",
-    "deepSearchModel": "deepseek-v4-flash",
-    "imageSearchModel": "qwen3.7-plus"
-  }
-}
-```
-
-Environment variables take precedence over the config file.
-
-| Config Key | Env Variable (overrides) | Default | Description |
-|------------|--------------------------|---------|-------------|
-| `aliyun.baseUrl` | `ALIYUN_BASE_URL` | `https://dashscope.aliyuncs.com/compatible-mode/v1` | Aliyun API base URL |
-| `aliyun.aliyunProviderKey` | — | `aliyun` | Pi provider name to extract apiKey/baseUrl from |
-| `aliyun.deepSearchModel` | `ALIYUN_DEEP_SEARCH_MODEL` | `deepseek-v4-flash` | Model for deep_search |
-| `aliyun.imageSearchModel` | `ALIYUN_IMAGE_SEARCH_MODEL` | `qwen3.7-plus` | Model for image_search |
-
-**aliyunProviderKey:** deep_search and image_search will extract apiKey and baseUrl from the corresponding pi provider (via `modelRegistry`). Defaults to `"aliyun"`. Environment variables take precedence over provider values. If the provider is not found, falls back to `aliyun.baseUrl` config or default.
-
-> **Note:** deep_search uses Chat Completions API and does not return structured sources. image_search uses Responses API.
-
-> **Security:** API keys are NEVER read from config files — only from environment variables or pi's built-in credential store (`/login`).
 
 ## Tools Reference
 
@@ -88,36 +49,6 @@ Search the web with automatic source fallback.
 
 **Source:** **Exa** — AI-native search API. With `EXA_API_KEY`: full REST API. Without: MCP free tier (150 calls/day, 3 QPS). Always available, no key needed for basic usage.
 
-### deep_search
-
-Deep research using Aliyun's LLM-powered search with web content extraction. The model searches the web, extracts page content, and synthesizes a comprehensive answer.
-
-**Parameters:**
-
-| Parameter | Type | Required | Default | Description |
-|-----------|------|----------|---------|-------------|
-| `query` | string | yes | — | Research question |
-| `enableSearchExtension` | boolean | no | false | Enable vertical domain search |
-| `freshness` | number | no | — | Time range: 7/30/180/365 days |
-| `assignedSiteList` | string[] | no | — | Restrict search to specific sites |
-| `enableImageOutput` | boolean | no | false | Enable mixed text-image output |
-
-> Requires `ALIYUN_API_KEY` or `aliyunProviderKey` config. Uses Chat Completions API with forced search (turbo strategy). Sources are not returned.
-
-### image_search
-
-Search images by text description or find visually similar images by URL.
-
-**Parameters:**
-
-| Parameter | Type | Required | Description |
-|-----------|------|----------|-------------|
-| `query` | string | no | Text description for text-to-image search |
-| `imageUrl` | string | no | Public image URL for image-to-image search |
-
-> At least one of `query` or `imageUrl` must be provided. Both can be combined.
-> The image URL must be publicly accessible. Requires `ALIYUN_API_KEY`.
-
 ### web_fetch
 
 Fetch content from a URL and return as text, markdown, or raw HTML.

package/index.ts

@@ -1,9 +1,6 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { loadConfig } from "./src/config";
-import { deepSearch } from "./src/deep_search/index";
-import { imageSearch } from "./src/image_search/index";
 import { webFetch } from "./src/web_fetch";
 import { search } from "./src/web_search/index";
 
@@ -80,162 +77,6 @@ export default function (pi: ExtensionAPI) {
 		},
 	});
 
-	// -------------------------------------------------------------------
-	// deep_search
-	// -------------------------------------------------------------------
-	pi.registerTool({
-		name: "deep_search",
-		label: "Deep Search",
-		description:
-			"Deep search powered by Aliyun (Bailian) using Chat Completions API with web search. The model searches the web and synthesizes a comprehensive answer. Supports vertical domain search, time range filtering, site restriction, and mixed image output.",
-		promptSnippet:
-			"deep_search: Aliyun-powered deep search that synthesizes web results into a comprehensive answer. Supports vertical domain search, time range filtering, site restriction, and mixed image output.",
-		promptGuidelines: [
-			"Use deep_search for complex research questions that benefit from web search synthesis.",
-			"deep_search is powered by Aliyun Chat Completions API. Configure ALIYUN_API_KEY or use aliyunProviderKey in config.",
-		],
-		parameters: Type.Object({
-			query: Type.String({ minLength: 2, description: "The search query." }),
-			enableSearchExtension: Type.Optional(
-				Type.Boolean({ description: "Enable vertical domain search for more precise results." }),
-			),
-			freshness: Type.Optional(
-				Type.Number({
-					enum: [7, 30, 180, 365],
-					description: "Time range filter: 7/30/180/365 days. Only effective with turbo strategy.",
-				}),
-			),
-			assignedSiteList: Type.Optional(
-				Type.Array(Type.String(), {
-					description: 'Restrict search to specific sites (e.g. ["baidu.com", "sina.cn"]).',
-				}),
-			),
-			enableImageOutput: Type.Optional(Type.Boolean({ description: "Enable mixed text-image output in the response." })),
-		}),
-		renderCall(args, theme) {
-			const p = args as { query: string };
-			return new Text(
-				theme.fg("toolTitle", theme.bold("deep_search ")) + theme.fg("accent", `"${p.query || "..."}"`),
-				0,
-				0,
-			);
-		},
-		renderResult(result, { expanded }, theme) {
-			const text = result.content?.[0];
-			const body = text?.type === "text" ? text.text : "";
-			const lines = body.split("\n");
-			if (!expanded) {
-				const preview = lines.slice(0, 6);
-				if (lines.length > 6) preview.push(theme.fg("dim", `... ${lines.length - 6} more lines · ctrl+o to expand`));
-				return new Text(preview.join("\n"), 0, 0);
-			}
-			return new Text(body, 0, 0);
-		},
-		async execute(_toolCallId, params, signal, onUpdate, ctx) {
-			const p = params as {
-				query: string;
-				enableSearchExtension?: boolean;
-				freshness?: number;
-				assignedSiteList?: string[];
-				enableImageOutput?: boolean;
-			};
-			const query = p.query?.trim();
-			if (!query) {
-				return { content: [{ type: "text", text: "Error: query is required." }], details: {}, isError: true };
-			}
-
-			onUpdate?.({ content: [{ type: "text", text: "Deep searching..." }], details: {} });
-
-			try {
-				const cfg = loadConfig(ctx.cwd);
-				const result = await deepSearch(query, signal, cfg.aliyun, ctx, {
-					enableSearchExtension: p.enableSearchExtension,
-					freshness: p.freshness,
-					assignedSiteList: p.assignedSiteList,
-					enableImageOutput: p.enableImageOutput,
-				});
-				const sourcesText = result.sources.length
-					? `\n\nSources:\n${result.sources.map((s, i) => `${i + 1}. [${s.title}](${s.url})`).join("\n")}`
-					: "";
-				return {
-					content: [{ type: "text", text: result.answer + sourcesText }],
-					details: { sources: result.sources },
-				};
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				return { content: [{ type: "text", text: `Deep search failed: ${message}` }], details: {}, isError: true };
-			}
-		},
-	});
-
-	// -------------------------------------------------------------------
-	// image_search
-	// -------------------------------------------------------------------
-	pi.registerTool({
-		name: "image_search",
-		label: "Image Search",
-		description:
-			"Search for images by text description or find similar images by URL. Powered by Aliyun (Bailian). Returns image results and model analysis.",
-		promptSnippet: "image_search: search images by text or find similar images by URL. Powered by Aliyun (Bailian).",
-		promptGuidelines: [
-			"Use image_search to find images matching a text description (provide query).",
-			"Use image_search to find visually similar images (provide imageUrl, the image must be a publicly accessible URL).",
-			"Both query and imageUrl can be provided together for combined search.",
-		],
-		parameters: Type.Object({
-			query: Type.Optional(Type.String({ minLength: 2, description: "Text description of the image to search for." })),
-			imageUrl: Type.Optional(Type.String({ description: "Public URL of the image to find similar images." })),
-		}),
-		renderCall(args, theme) {
-			const p = args as { query?: string; imageUrl?: string };
-			const label = theme.fg("toolTitle", theme.bold("image_search "));
-			if (p.imageUrl) return new Text(label + theme.fg("accent", `[image: ${p.imageUrl}]`), 0, 0);
-			return new Text(label + theme.fg("accent", `"${p.query || "..."}"`), 0, 0);
-		},
-		renderResult(result, { expanded }, theme) {
-			const text = result.content?.[0];
-			const body = text?.type === "text" ? text.text : "";
-			const lines = body.split("\n");
-			if (!expanded) {
-				const preview = lines.slice(0, 6);
-				if (lines.length > 6) preview.push(theme.fg("dim", `... ${lines.length - 6} more lines · ctrl+o to expand`));
-				return new Text(preview.join("\n"), 0, 0);
-			}
-			return new Text(body, 0, 0);
-		},
-		async execute(_toolCallId, params, signal, onUpdate, ctx: ExtensionContext) {
-			const p = params as { query?: string; imageUrl?: string };
-			if (!p.query && !p.imageUrl) {
-				return {
-					content: [{ type: "text", text: "Error: at least one of query or imageUrl is required." }],
-					details: {},
-					isError: true,
-				};
-			}
-
-			onUpdate?.({ content: [{ type: "text", text: "Searching images..." }], details: {} });
-
-			try {
-				const cfg = loadConfig(ctx.cwd);
-				const result = await imageSearch({ query: p.query, imageUrl: p.imageUrl }, signal, cfg.aliyun, ctx);
-				const imagesText = result.images.length
-					? "\n\nImages:\n" + result.images.map((img) => `${img.index}. [${img.title}](${img.url})`).join("\n")
-					: "";
-				return {
-					content: [{ type: "text", text: result.answer + imagesText }],
-					details: { images: result.images },
-				};
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				return {
-					content: [{ type: "text", text: `Image search failed: ${message}` }],
-					details: {},
-					isError: true,
-				};
-			}
-		},
-	});
-
 	// -------------------------------------------------------------------
 	// web_fetch
 	// -------------------------------------------------------------------

package/package.json

@@ -3,9 +3,14 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "0.1.0",
-	"description": "pi package providing web_search, deep_search, image_search and web_fetch tools",
+	"version": "0.3.0",
+	"description": "pi package providing web_search and web_fetch tools",
 	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/yandy/pi-packages",
+		"directory": "pi-web-tools"
+	},
 	"type": "module",
 	"keywords": [
 		"pi-package"
@@ -27,9 +32,6 @@
 			"./index.ts"
 		]
 	},
-	"dependencies": {
-		"openai": "^6.26.0"
-	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": ">=0.74.0"
 	},

package/src/config.ts

@@ -5,8 +5,6 @@ interface WebToolsConfig {
 	aliyun?: {
 		baseUrl?: string;
 		aliyunProviderKey?: string;
-		deepSearchModel?: string;
-		imageSearchModel?: string;
 	};
 }
 

package/src/deep_search/aliyun.ts

@@ -1,48 +0,0 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type OpenAI from "openai";
-import { resolveSetting } from "../config";
-import { createAliyunClient } from "../openai_client";
-import { resolveAliyunProvider } from "../provider";
-import type { DeepSearchOptions, DeepSearchResponse } from "./types";
-
-const DEFAULT_DEEP_SEARCH_MODEL = "deepseek-v4-flash";
-const TIMEOUT_MS = 120_000;
-
-export async function aliyunDeepSearch(
-	query: string,
-	signal?: AbortSignal,
-	config?: { baseUrl?: string; aliyunProviderKey?: string; deepSearchModel?: string },
-	ctx?: ExtensionContext,
-	searchOpts?: DeepSearchOptions,
-): Promise<DeepSearchResponse> {
-	const { apiKey, baseUrl } = await resolveAliyunProvider({ ctx, config });
-	const model = resolveSetting(process.env.ALIYUN_DEEP_SEARCH_MODEL, config?.deepSearchModel, DEFAULT_DEEP_SEARCH_MODEL);
-	const client = createAliyunClient({ apiKey, baseUrl });
-
-	const s = signal ? AbortSignal.any([signal, AbortSignal.timeout(TIMEOUT_MS)]) : AbortSignal.timeout(TIMEOUT_MS);
-
-	const { enableSearchExtension, freshness, assignedSiteList, enableImageOutput } = searchOpts ?? {};
-
-	const searchOptions: Record<string, unknown> = {
-		search_strategy: "turbo",
-		forced_search: true,
-		...(enableSearchExtension && { enable_search_extension: true }),
-		...(freshness && { freshness }),
-		...(assignedSiteList?.length && { assigned_site_list: assignedSiteList }),
-	};
-
-	const completion = await client.chat.completions.create(
-		{
-			model,
-			messages: [{ role: "user", content: query }],
-			stream: false,
-			enable_search: true,
-			search_options: searchOptions,
-			...(enableImageOutput && { enable_text_image_mixed: true }),
-		} as unknown as OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming,
-		{ signal: s },
-	);
-
-	const answer = completion.choices[0]?.message?.content || "No results";
-	return { answer, sources: [] };
-}

package/src/deep_search/index.ts

@@ -1 +0,0 @@
-export { aliyunDeepSearch as deepSearch } from "./aliyun";

package/src/deep_search/types.ts

@@ -1,16 +0,0 @@
-export interface DeepSearchSource {
-	title: string;
-	url: string;
-}
-
-export interface DeepSearchResponse {
-	answer: string;
-	sources: DeepSearchSource[];
-}
-
-export interface DeepSearchOptions {
-	enableSearchExtension?: boolean;
-	freshness?: number;
-	assignedSiteList?: string[];
-	enableImageOutput?: boolean;
-}

package/src/image_search/aliyun.ts

@@ -1,87 +0,0 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type OpenAI from "openai";
-import { resolveSetting } from "../config";
-import { createAliyunClient } from "../openai_client";
-import { resolveAliyunProvider } from "../provider";
-import type { ImageResult, ImageSearchParams, ImageSearchResponse } from "./types";
-
-const DEFAULT_IMAGE_SEARCH_MODEL = "qwen3.7-plus";
-const TIMEOUT_MS = 120_000;
-
-export async function aliyunImageSearch(
-	params: ImageSearchParams,
-	signal?: AbortSignal,
-	config?: { baseUrl?: string; aliyunProviderKey?: string; imageSearchModel?: string },
-	ctx?: ExtensionContext,
-): Promise<ImageSearchResponse> {
-	const { query, imageUrl } = params;
-
-	if (!query && !imageUrl) {
-		throw new Error("At least one of query or imageUrl must be provided");
-	}
-
-	const { apiKey, baseUrl } = await resolveAliyunProvider({ ctx, config });
-	const model = resolveSetting(
-		process.env.ALIYUN_IMAGE_SEARCH_MODEL,
-		config?.imageSearchModel,
-		DEFAULT_IMAGE_SEARCH_MODEL,
-	);
-	const client = createAliyunClient({ apiKey, baseUrl });
-
-	const s = signal ? AbortSignal.any([signal, AbortSignal.timeout(TIMEOUT_MS)]) : AbortSignal.timeout(TIMEOUT_MS);
-
-	let input: unknown;
-	let tools: Array<{ type: string }>;
-
-	if (imageUrl) {
-		tools = [{ type: "image_search" }];
-		const content: Array<{ type: string; [key: string]: unknown }> = [];
-		if (query) {
-			content.push({ type: "input_text", text: query });
-		}
-		content.push({ type: "input_image", image_url: imageUrl });
-		input = [{ role: "user", content }];
-	} else {
-		tools = [{ type: "web_search_image" }];
-		input = query;
-	}
-
-	const response = (await client.responses.create(
-		{ model, input, tools } as unknown as OpenAI.Responses.ResponseCreateParams,
-		{ signal: s },
-	)) as unknown as AliyunImageResponse;
-
-	const images = parseImages(response.output);
-	const answer = parseAnswer(response.output);
-
-	return { answer, images };
-}
-
-interface AliyunImageResponse {
-	output?: Array<{
-		type: string;
-		output?: string;
-		content?: Array<{ type?: string; text?: string }>;
-	}>;
-}
-
-function parseImages(output: AliyunImageResponse["output"] = []): ImageResult[] {
-	for (const item of output) {
-		if (item.type === "web_search_image_call" || item.type === "image_search_call") {
-			try {
-				return JSON.parse(item.output || "[]") as ImageResult[];
-			} catch {
-				return [];
-			}
-		}
-	}
-	return [];
-}
-
-function parseAnswer(output: AliyunImageResponse["output"] = []): string {
-	const messages = output.filter((item) => item.type === "message");
-	const texts = messages.flatMap((m) =>
-		(m.content || []).filter((c) => c.type === "output_text").map((c) => c.text || ""),
-	);
-	return texts.join("\n") || "No results";
-}

package/src/image_search/index.ts

@@ -1 +0,0 @@
-export { aliyunImageSearch as imageSearch } from "./aliyun";

package/src/image_search/types.ts

@@ -1,15 +0,0 @@
-export interface ImageResult {
-	index: number;
-	title: string;
-	url: string;
-}
-
-export interface ImageSearchResponse {
-	answer: string;
-	images: ImageResult[];
-}
-
-export interface ImageSearchParams {
-	query?: string;
-	imageUrl?: string;
-}

package/src/openai_client.ts

@@ -1,9 +0,0 @@
-import OpenAI from "openai";
-
-export function createAliyunClient(opts: { apiKey: string; baseUrl: string }): OpenAI {
-	return new OpenAI({
-		apiKey: opts.apiKey,
-		baseURL: opts.baseUrl,
-		maxRetries: 0,
-	});
-}

package/src/provider.ts

@@ -1,69 +0,0 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-
-const DEFAULT_BASE_URL = "https://dashscope.aliyuncs.com/compatible-mode/v1";
-const DEFAULT_PROVIDER_KEY = "aliyun";
-
-interface ProviderConfig {
-	baseUrl?: string;
-	aliyunProviderKey?: string;
-}
-
-interface ResolvedProvider {
-	apiKey: string;
-	baseUrl: string;
-}
-
-export async function resolveAliyunProvider(opts: {
-	ctx?: ExtensionContext;
-	config?: ProviderConfig;
-}): Promise<ResolvedProvider> {
-	const { ctx, config } = opts;
-	const providerKey = config?.aliyunProviderKey ?? DEFAULT_PROVIDER_KEY;
-
-	// --- apiKey ---
-	let apiKey: string | undefined;
-
-	const envApiKey = process.env.ALIYUN_API_KEY;
-	if (envApiKey) {
-		apiKey = envApiKey;
-	}
-
-	if (!apiKey && providerKey && ctx) {
-		const providerKeyResult = await ctx.modelRegistry.getApiKeyForProvider(providerKey);
-		if (providerKeyResult) {
-			apiKey = providerKeyResult;
-		}
-	}
-
-	if (!apiKey) {
-		throw new Error(
-			"ALIYUN_API_KEY not configured. Set ALIYUN_API_KEY or configure aliyunProviderKey with a valid pi provider.",
-		);
-	}
-
-	// --- baseUrl ---
-	let baseUrl: string | undefined;
-
-	const envBaseUrl = process.env.ALIYUN_BASE_URL;
-	if (envBaseUrl) {
-		baseUrl = envBaseUrl;
-	}
-
-	if (!baseUrl && providerKey && ctx) {
-		const allModels = ctx.modelRegistry.getAll();
-		const matchingModel = allModels.find((m) => m.provider === providerKey);
-		if (matchingModel?.baseUrl) {
-			baseUrl = matchingModel.baseUrl;
-		}
-	}
-
-	if (!baseUrl && config?.baseUrl) {
-		baseUrl = config.baseUrl;
-	}
-
-	if (!baseUrl) {
-		baseUrl = DEFAULT_BASE_URL;
-	}
-
-	return { apiKey, baseUrl };
-}