fix: code review cleanup, pin deps, update descriptions, fix formatting

Author: whaaaley

.gitignore

@@ -3,3 +3,4 @@
 node_modules/
 dist/
 .env
+.cache

deno.json

@@ -4,7 +4,7 @@
   "version": "0.0.1",
   "exports": "./search.ts",
   "repository": "https://github.com/whaaaley/opencode-search",
-  "description": "OpenCode plugin that provides web search, inter-instance chat, and session management tools.",
+  "description": "OpenCode plugin that provides web search tools using Google CSE and DuckDuckGo.",
   "tasks": {
     "test": "deno test --allow-read --allow-env --allow-write --allow-net",
     "fmt": "deno run -A npm:dprint fmt"

deno.lock

@@ -1,7 +1,7 @@
 {
   "name": "opencode-search",
   "version": "0.0.1",
-  "description": "OpenCode plugin that provides web search, inter-instance chat, and session management tools.",
+  "description": "OpenCode plugin that provides web search tools using Google CSE and DuckDuckGo.",
   "keywords": [
     "opencode",
     "opencode-plugin",
@@ -20,7 +20,7 @@
     "url": "git+https://github.com/whaaaley/opencode-search.git"
   },
   "license": "MIT",
-  "author": "Dustin Whalen",
+  "author": "Dustin Dowell",
   "type": "module",
   "exports": {
     ".": {
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@opencode-ai/plugin": "1.1.12",
-    "@types/jsdom": "^27.0.0",
+    "@types/jsdom": "27.0.0",
     "@types/node": "^25.1.0",
     "typescript": "5.9.3"
   },

package.json

@@ -1,5 +1,5 @@
 import type { Plugin } from '@opencode-ai/plugin'
-import { webSearchTool, googleSearchTool, ddgSearchTool } from './src/search.ts'
+import { ddgSearchTool, googleSearchTool, webSearchTool } from './src/search.ts'
 
 // deno-lint-ignore require-await
 const plugin: Plugin = async () => {

search.ts

@@ -1,27 +1,32 @@
 import { tool } from '@opencode-ai/plugin'
-import { googleSearch } from './utils/google-search.ts'
 import { ddgSearch } from './utils/ddg-search.ts'
+import { googleSearch } from './utils/google-search.ts'
 
 // deno-lint-ignore no-explicit-any
 const formatGoogleResults = (results: any): string => {
+  const request = results.queries && results.queries.request
+  const totalResults = request && request[0] && request[0].totalResults
+
+  // deno-lint-ignore no-explicit-any
+  const items = results.items
+    ? results.items.map((item: any) => ({
+      title: item.title,
+      link: item.link,
+      snippet: item.snippet,
+    }))
+    : []
+
   return JSON.stringify(
     {
       source: 'google',
-      totalResults: results.queries?.request?.[0]?.totalResults,
-      items:
-        // deno-lint-ignore no-explicit-any
-        results.items?.map((item: any) => ({
-          title: item.title,
-          link: item.link,
-          snippet: item.snippet,
-        })) || [],
+      totalResults,
+      items,
     },
     null,
     2,
   )
 }
 
-// Shared result formatter for DDG results
 const formatDdgResults = (textContent: string) => {
   return JSON.stringify(
     {
@@ -65,8 +70,7 @@ export const webSearchTool = tool({
 })
 
 export const googleSearchTool = tool({
-  description:
-    'Search Google Custom Search Engine and return results with titles, links, and snippets',
+  description: 'Search Google Custom Search Engine and return results with titles, links, and snippets',
   args: {
     query: tool.schema.string().describe('The search query'),
   },

src/search.ts

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs'
-import { readFile, writeFile, mkdir } from 'node:fs/promises'
-import { join, dirname } from 'node:path'
+import { readFile, writeFile } from 'node:fs/promises'
+import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const CACHE_FILE = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '.cache')
@@ -34,10 +34,6 @@ const loadCache = async () => {
 }
 
 const saveCache = async () => {
-  const dir = dirname(CACHE_FILE)
-  if (!existsSync(dir)) {
-    await mkdir(dir, { recursive: true })
-  }
   await writeFile(CACHE_FILE, JSON.stringify(store, null, 2))
 }
 

src/utils/cache.ts

@@ -1,5 +1,5 @@
-import { JSDOM, VirtualConsole } from 'jsdom'
 import { Readability } from '@mozilla/readability'
+import { JSDOM, VirtualConsole } from 'jsdom'
 import * as cache from './cache.ts'
 
 const DDG_URL = 'https://html.duckduckgo.com/html/'

src/utils/ddg-search.ts

@@ -1,17 +1,5 @@
-import { env } from './env.ts'
 import * as cache from './cache.ts'
-
-export type SearchRequestInfo = {
-  title: string
-  totalResults: string
-  searchTerms: string
-  count: number
-  startIndex: number
-  inputEncoding: string
-  outputEncoding: string
-  safe: string
-  cx: string
-}
+import { env } from './env.ts'
 
 export type SearchItem = {
   kind: string
@@ -25,19 +13,12 @@ export type SearchItem = {
   htmlFormattedUrl: string
 }
 
-export type SearchQueries = {
-  request: Array<SearchRequestInfo>
-}
-
-export type SearchUrl = {
-  type: string
-  template: string
-}
-
 export type SearchResult = {
   kind: string
-  url: SearchUrl
-  queries: SearchQueries
+  // deno-lint-ignore no-explicit-any
+  url: any
+  // deno-lint-ignore no-explicit-any
+  queries: any
   items: Array<SearchItem>
 }
 
@@ -51,7 +32,7 @@ export const googleSearch = async (query: string): Promise<SearchResult> => {
   const cacheKey = 'search:' + query
 
   const cached = await cache.get(cacheKey)
-  if (cached && cached.items?.length > 0) {
+  if (cached && cached.items && cached.items.length > 0) {
     return cached
   }
 
@@ -73,7 +54,9 @@ export const googleSearch = async (query: string): Promise<SearchResult> => {
   if (!res.ok) {
     const errorMessage = json.error?.message || 'Unknown error'
     const errorCode = json.error?.code || res.status
-    throw new Error('Google Search API error (' + errorCode + '): ' + errorMessage)
+    throw new Error(
+      ['Google Search API error (', errorCode, '): ', errorMessage].join(''),
+    )
   }
 
   if (!json.items || json.items.length === 0) {
@@ -86,7 +69,9 @@ export const googleSearch = async (query: string): Promise<SearchResult> => {
   })
 
   if (filtered.length === 0) {
-    throw new Error('Google Search returned results but all were from blocked domains for: ' + query)
+    throw new Error(
+      'Google Search returned results but all were from blocked domains for: ' + query,
+    )
   }
 
   const result: SearchResult = { ...json, items: filtered }