@oh-my-pi/anthropic-websearch 0.1.0 → 0.8.1

package/README.md

@@ -16,14 +16,18 @@ The plugin checks for credentials in this order:
 
 1. **Explicit override**: `ANTHROPIC_SEARCH_API_KEY` / `ANTHROPIC_SEARCH_BASE_URL`
 2. **models.json**: Provider with `api: "anthropic-messages"` in `~/.pi/agent/models.json`
-3. **OAuth**: Anthropic OAuth credentials in `~/.pi/agent/auth.json`
+3. **OAuth**: Anthropic OAuth credentials in `~/.pi/agent/auth.json` (Claude Code tokens supported)
 4. **Fallback**: `ANTHROPIC_API_KEY` / `ANTHROPIC_BASE_URL`
 
 This ordering prevents accidentally charging your console account if you have a proxy or OAuth set up.
 
-### Example: Using a proxy
+### Using Claude Code OAuth tokens
 
-If your `~/.pi/agent/models.json` has:
+If you're logged into Claude Code (`pi login`), the plugin will automatically use your OAuth token from `~/.pi/agent/auth.json`. OAuth tokens (`sk-ant-oat01-...`) are fully supported with proper Claude Code identity headers.
+
+### Using a proxy
+
+If your `~/.pi/agent/models.json` has a provider with `api: "anthropic-messages"`:
 
 ```json
 {
@@ -38,12 +42,12 @@ If your `~/.pi/agent/models.json` has:
 }
 ```
 
-The plugin will automatically use `http://localhost:4000` with no API key.
+The plugin will automatically use `http://localhost:4000`.
 
-### Example: Direct API key
+### Direct API key
 
 ```bash
-export ANTHROPIC_SEARCH_API_KEY=sk-ant-xxx
+export ANTHROPIC_SEARCH_API_KEY=sk-ant-api03-xxx
 ```
 
 ## Tools
@@ -66,11 +70,27 @@ Search the web using Claude's built-in web search capability.
 
 ## Configuration
 
-| Variable  | Env                         | Description                                        |
-| --------- | --------------------------- | -------------------------------------------------- |
-| `apiKey`  | `ANTHROPIC_SEARCH_API_KEY`  | API key (optional if using proxy/oauth)            |
-| `baseUrl` | `ANTHROPIC_SEARCH_BASE_URL` | Base URL override                                  |
-| `model`   | `ANTHROPIC_SEARCH_MODEL`    | Model to use (default: `claude-sonnet-4-20250514`) |
+| Variable  | Env                         | Description                                          |
+| --------- | --------------------------- | ---------------------------------------------------- |
+| `apiKey`  | `ANTHROPIC_SEARCH_API_KEY`  | API key (optional if using proxy/oauth)              |
+| `baseUrl` | `ANTHROPIC_SEARCH_BASE_URL` | Base URL override                                    |
+| `model`   | `ANTHROPIC_SEARCH_MODEL`    | Model to use (default: `claude-sonnet-4-5-20250514`) |
+
+Configure via `omp config`:
+
+```bash
+# Set a different model
+omp config @oh-my-pi/anthropic-websearch model claude-opus-4-20250514
+
+# View current config
+omp config @oh-my-pi/anthropic-websearch
+```
+
+Or via environment variables:
+
+```bash
+export ANTHROPIC_SEARCH_MODEL=claude-opus-4-20250514
+```
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oh-my-pi/anthropic-websearch",
-  "version": "0.1.0",
+  "version": "0.8.1",
   "description": "Anthropic Claude web search tool for pi",
   "keywords": [
     "omp-plugin",
@@ -17,6 +17,11 @@
   },
   "omp": {
     "install": [
+      {
+        "src": "tools/anthropic-websearch/runtime.json",
+        "dest": "agent/tools/anthropic-websearch/runtime.json",
+        "copy": true
+      },
       {
         "src": "tools/anthropic-websearch/index.ts",
         "dest": "agent/tools/anthropic-websearch/index.ts"
@@ -39,7 +44,7 @@
         "type": "string",
         "env": "ANTHROPIC_SEARCH_MODEL",
         "description": "Model to use for web search",
-        "default": "claude-sonnet-4-20250514"
+        "default": "claude-sonnet-4-5-20250514"
       }
     }
   },

package/tools/anthropic-websearch/index.ts

@@ -19,13 +19,23 @@ import type {
   CustomToolFactory,
   ToolAPI,
 } from "@mariozechner/pi-coding-agent";
+import runtime from "./runtime.json";
 
 const DEFAULT_BASE_URL = "https://api.anthropic.com";
-const DEFAULT_MODEL = "claude-sonnet-4-20250514";
+const DEFAULT_MODEL = "claude-sonnet-4-5-20250514";
+
+interface RuntimeConfig {
+  options?: {
+    model?: string;
+    apiKey?: string;
+    baseUrl?: string;
+  };
+}
 
 interface AuthConfig {
   apiKey: string;
   baseUrl: string;
+  isOAuth: boolean;
 }
 
 interface ModelsJson {
@@ -40,6 +50,7 @@ interface AuthJson {
   anthropic?: {
     type: "oauth";
     access: string;
+    refresh?: string;
     expires: number;
   };
 }
@@ -107,9 +118,31 @@ function readJson<T>(filePath: string): T | null {
   }
 }
 
+/**
+ * Check if a token is an OAuth token
+ */
+function isOAuthToken(apiKey: string): boolean {
+  return apiKey.includes("sk-ant-oat");
+}
+
+/**
+ * Get runtime config value, falling back to env var
+ */
+function getConfig(key: "model" | "apiKey" | "baseUrl"): string | undefined {
+  const cfg = (runtime as RuntimeConfig).options ?? {};
+  if (cfg[key]) return cfg[key];
+
+  const envMap = {
+    model: "ANTHROPIC_SEARCH_MODEL",
+    apiKey: "ANTHROPIC_SEARCH_API_KEY",
+    baseUrl: "ANTHROPIC_SEARCH_BASE_URL",
+  };
+  return getEnv(envMap[key]);
+}
+
 /**
  * Find auth config using priority order:
- * 1. ANTHROPIC_SEARCH_API_KEY / ANTHROPIC_SEARCH_BASE_URL
+ * 1. Runtime config / ANTHROPIC_SEARCH_API_KEY / ANTHROPIC_SEARCH_BASE_URL
  * 2. Provider with api="anthropic-messages" in models.json
  * 3. OAuth in auth.json
  * 4. ANTHROPIC_API_KEY / ANTHROPIC_BASE_URL fallback
@@ -117,13 +150,14 @@ function readJson<T>(filePath: string): T | null {
 function findAuthConfig(): AuthConfig | null {
   const piAgentDir = path.join(os.homedir(), ".pi", "agent");
 
-  // 1. Explicit search-specific env vars
-  const searchApiKey = getEnv("ANTHROPIC_SEARCH_API_KEY");
-  const searchBaseUrl = getEnv("ANTHROPIC_SEARCH_BASE_URL");
+  // 1. Explicit config or env vars
+  const searchApiKey = getConfig("apiKey");
+  const searchBaseUrl = getConfig("baseUrl");
   if (searchApiKey) {
     return {
       apiKey: searchApiKey,
       baseUrl: searchBaseUrl ?? DEFAULT_BASE_URL,
+      isOAuth: isOAuthToken(searchApiKey),
     };
   }
 
@@ -135,6 +169,7 @@ function findAuthConfig(): AuthConfig | null {
         return {
           apiKey: provider.apiKey,
           baseUrl: provider.baseUrl ?? DEFAULT_BASE_URL,
+          isOAuth: isOAuthToken(provider.apiKey),
         };
       }
     }
@@ -144,6 +179,7 @@ function findAuthConfig(): AuthConfig | null {
         return {
           apiKey: provider.apiKey ?? "",
           baseUrl: provider.baseUrl,
+          isOAuth: false,
         };
       }
     }
@@ -152,11 +188,12 @@ function findAuthConfig(): AuthConfig | null {
   // 3. OAuth credentials in auth.json
   const authJson = readJson<AuthJson>(path.join(piAgentDir, "auth.json"));
   if (authJson?.anthropic?.type === "oauth" && authJson.anthropic.access) {
-    // Check if not expired
-    if (authJson.anthropic.expires > Date.now()) {
+    // Check if not expired (with 5 min buffer)
+    if (authJson.anthropic.expires > Date.now() + 5 * 60 * 1000) {
       return {
         apiKey: authJson.anthropic.access,
         baseUrl: DEFAULT_BASE_URL,
+        isOAuth: true,
       };
     }
   }
@@ -168,20 +205,66 @@ function findAuthConfig(): AuthConfig | null {
     return {
       apiKey,
       baseUrl: baseUrl ?? DEFAULT_BASE_URL,
+      isOAuth: isOAuthToken(apiKey),
     };
   }
 
   return null;
 }
 
-// Response types
-interface ServerToolUse {
-  type: "server_tool_use";
-  id: string;
-  name: "web_search";
-  input: { query: string };
+/**
+ * Build headers for Anthropic API request
+ */
+function buildHeaders(auth: AuthConfig): Record<string, string> {
+  const betas = ["web-search-2025-03-05"];
+
+  if (auth.isOAuth) {
+    // OAuth requires additional beta headers and stainless telemetry
+    betas.push(
+      "oauth-2025-04-20",
+      "claude-code-20250219",
+      "prompt-caching-2024-07-31",
+    );
+
+    return {
+      "anthropic-version": "2023-06-01",
+      "authorization": `Bearer ${auth.apiKey}`,
+      "accept": "application/json",
+      "content-type": "application/json",
+      "anthropic-dangerous-direct-browser-access": "true",
+      "anthropic-beta": betas.join(","),
+      "user-agent": "claude-cli/2.0.46 (external, cli)",
+      "x-app": "cli",
+      // Stainless SDK telemetry headers (required for OAuth)
+      "x-stainless-arch": "x64",
+      "x-stainless-lang": "js",
+      "x-stainless-os": "Linux",
+      "x-stainless-package-version": "0.60.0",
+      "x-stainless-retry-count": "1",
+      "x-stainless-runtime": "node",
+      "x-stainless-runtime-version": "v24.3.0",
+    };
+  } else {
+    // Standard API key auth
+    return {
+      "anthropic-version": "2023-06-01",
+      "x-api-key": auth.apiKey,
+      "accept": "application/json",
+      "content-type": "application/json",
+      "anthropic-beta": betas.join(","),
+    };
+  }
 }
 
+/**
+ * Build API URL (OAuth requires ?beta=true)
+ */
+function buildUrl(auth: AuthConfig): string {
+  const base = `${auth.baseUrl}/v1/messages`;
+  return auth.isOAuth ? `${base}?beta=true` : base;
+}
+
+// Response types
 interface WebSearchResult {
   type: "web_search_result";
   title: string;
@@ -190,12 +273,6 @@ interface WebSearchResult {
   page_age: string | null;
 }
 
-interface WebSearchToolResult {
-  type: "web_search_tool_result";
-  tool_use_id: string;
-  content: WebSearchResult[];
-}
-
 interface Citation {
   type: "web_search_result_location";
   url: string;
@@ -204,38 +281,60 @@ interface Citation {
   encrypted_index: string;
 }
 
-interface TextBlock {
-  type: "text";
-  text: string;
+interface ContentBlock {
+  type: string;
+  text?: string;
   citations?: Citation[];
+  name?: string;
+  input?: { query: string };
+  content?: WebSearchResult[];
 }
 
-type ContentBlock = ServerToolUse | WebSearchToolResult | TextBlock;
-
-interface MessagesResponse {
+interface ApiResponse {
   id: string;
-  type: string;
-  role: string;
-  content: ContentBlock[];
   model: string;
-  stop_reason: string;
+  content: ContentBlock[];
   usage: {
     input_tokens: number;
     output_tokens: number;
+    cache_read_input_tokens?: number;
+    cache_creation_input_tokens?: number;
+    server_tool_use?: { web_search_requests: number };
   };
 }
 
 /**
- * Call Anthropic Messages API with web search tool
+ * Call Anthropic API with web search
  */
-async function callAnthropicWebSearch(
+async function callWebSearch(
   auth: AuthConfig,
-  query: string,
   model: string,
+  query: string,
   systemPrompt?: string,
   maxTokens?: number,
-): Promise<MessagesResponse> {
-  const url = `${auth.baseUrl}/v1/messages`;
+): Promise<ApiResponse> {
+  const url = buildUrl(auth);
+  const headers = buildHeaders(auth);
+
+  // Build system blocks
+  const systemBlocks: Array<{ type: string; text: string; cache_control?: { type: string } }> = [];
+
+  if (auth.isOAuth) {
+    // OAuth requires Claude Code identity with cache_control
+    systemBlocks.push({
+      type: "text",
+      text: "You are Claude Code, Anthropic's official CLI for Claude.",
+      cache_control: { type: "ephemeral" },
+    });
+  }
+
+  if (systemPrompt) {
+    systemBlocks.push({
+      type: "text",
+      text: systemPrompt,
+      ...(auth.isOAuth ? { cache_control: { type: "ephemeral" } } : {}),
+    });
+  }
 
   const body: Record<string, unknown> = {
     model,
@@ -244,21 +343,8 @@ async function callAnthropicWebSearch(
     tools: [{ type: "web_search_20250305", name: "web_search" }],
   };
 
-  if (systemPrompt) {
-    body.system = systemPrompt;
-  }
-
-  const headers: Record<string, string> = {
-    "Content-Type": "application/json",
-    "anthropic-version": "2023-06-01",
-  };
-
-  // Handle different auth types
-  if (auth.apiKey.startsWith("sk-ant-")) {
-    headers["x-api-key"] = auth.apiKey;
-  } else if (auth.apiKey && auth.apiKey !== "none") {
-    // OAuth token or other bearer token
-    headers["Authorization"] = `Bearer ${auth.apiKey}`;
+  if (systemBlocks.length > 0) {
+    body.system = systemBlocks;
   }
 
   const response = await fetch(url, {
@@ -272,13 +358,13 @@ async function callAnthropicWebSearch(
     throw new Error(`Anthropic API error (${response.status}): ${errorText}`);
   }
 
-  return response.json() as Promise<MessagesResponse>;
+  return response.json() as Promise<ApiResponse>;
 }
 
 /**
  * Format response for display
  */
-function formatResponse(response: MessagesResponse): { text: string; details: unknown } {
+function formatResponse(response: ApiResponse): { text: string; details: unknown } {
   const parts: string[] = [];
   const searchQueries: string[] = [];
   const sources: Array<{ title: string; url: string; age: string | null }> = [];
@@ -286,8 +372,8 @@ function formatResponse(response: MessagesResponse): { text: string; details: un
 
   for (const block of response.content) {
     if (block.type === "server_tool_use" && block.name === "web_search") {
-      searchQueries.push(block.input.query);
-    } else if (block.type === "web_search_tool_result") {
+      searchQueries.push(block.input?.query ?? "");
+    } else if (block.type === "web_search_tool_result" && block.content) {
       for (const result of block.content) {
         if (result.type === "web_search_result") {
           sources.push({
@@ -297,7 +383,7 @@ function formatResponse(response: MessagesResponse): { text: string; details: un
           });
         }
       }
-    } else if (block.type === "text") {
+    } else if (block.type === "text" && block.text) {
       parts.push(block.text);
       if (block.citations) {
         citations.push(...block.citations);
@@ -366,7 +452,7 @@ const factory: CustomToolFactory = async (
     return null;
   }
 
-  const model = getEnv("ANTHROPIC_SEARCH_MODEL") ?? DEFAULT_MODEL;
+  const model = getConfig("model") ?? DEFAULT_MODEL;
 
   const tool: CustomAgentTool<typeof SearchSchema, unknown> = {
     name: "anthropic_web_search",
@@ -376,10 +462,10 @@ const factory: CustomToolFactory = async (
     async execute(_toolCallId, params) {
       try {
         const p = (params ?? {}) as SearchParams;
-        const response = await callAnthropicWebSearch(
+        const response = await callWebSearch(
           auth,
-          p.query,
           model,
+          p.query,
           p.system_prompt,
           p.max_tokens,
         );

package/tools/anthropic-websearch/runtime.json

@@ -0,0 +1,3 @@
+{
+  "options": {}
+}