@pkgseer/cli 0.1.4 → 0.2.0

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   version
-} from "./shared/chunk-z505vakm.js";
+} from "./shared/chunk-1m9g9ehr.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -205,11 +205,65 @@ var CliDocsListDocument = gql`
     pages {
       id
       title
-      words
     }
   }
 }
     `;
+var CombinedSearchDocument = gql`
+    query CombinedSearch($packages: [SearchPackageInput!]!, $query: String!, $mode: SearchMode, $limit: Int) {
+  combinedSearch(packages: $packages, query: $query, mode: $mode, limit: $limit) {
+    query
+    mode
+    totalResults
+    entries {
+      id
+      type
+      title
+      subtitle
+      packageName
+      registry
+      score
+      snippet
+      filePath
+      startLine
+      endLine
+      language
+      chunkType
+      repoUrl
+      gitRef
+      pageId
+      sourceUrl
+    }
+    indexingStatus {
+      registry
+      packageName
+      version
+      codeStatus
+      docsStatus
+    }
+  }
+}
+    `;
+var FetchCodeContextDocument = gql`
+    query FetchCodeContext($repoUrl: String!, $gitRef: String!, $filePath: String!, $startLine: Int, $endLine: Int) {
+  fetchCodeContext(
+    repoUrl: $repoUrl
+    gitRef: $gitRef
+    filePath: $filePath
+    startLine: $startLine
+    endLine: $endLine
+  ) {
+    content
+    filePath
+    language
+    totalLines
+    startLine
+    endLine
+    repoUrl
+    gitRef
+  }
+}
+    `;
 var CliDocsGetDocument = gql`
     query CliDocsGet($registry: Registry!, $packageName: String!, $pageId: String!, $version: String) {
   fetchPackageDoc(
@@ -428,7 +482,6 @@ var ListPackageDocsDocument = gql`
       slug
       order
       linkName
-      words
       lastUpdatedAt
       sourceUrl
     }
@@ -509,7 +562,6 @@ var SearchPackageDocsDocument = gql`
       slug
       order
       linkName
-      words
       lastUpdatedAt
       sourceUrl
       matchCount
@@ -540,7 +592,6 @@ var SearchProjectDocsDocument = gql`
       registry
       packageName
       version
-      words
       matchCount
       titleHit
       score
@@ -560,6 +611,8 @@ var CliComparePackagesDocumentString = print(CliComparePackagesDocument);
 var CliDocsSearchDocumentString = print(CliDocsSearchDocument);
 var CliProjectDocsSearchDocumentString = print(CliProjectDocsSearchDocument);
 var CliDocsListDocumentString = print(CliDocsListDocument);
+var CombinedSearchDocumentString = print(CombinedSearchDocument);
+var FetchCodeContextDocumentString = print(FetchCodeContextDocument);
 var CliDocsGetDocumentString = print(CliDocsGetDocument);
 var CreateProjectDocumentString = print(CreateProjectDocument);
 var PackageSummaryDocumentString = print(PackageSummaryDocument);
@@ -598,6 +651,12 @@ function getSdk(client, withWrapper = defaultWrapper) {
     CliDocsList(variables, requestHeaders) {
       return withWrapper((wrappedRequestHeaders) => client.rawRequest(CliDocsListDocumentString, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CliDocsList", "query", variables);
     },
+    CombinedSearch(variables, requestHeaders) {
+      return withWrapper((wrappedRequestHeaders) => client.rawRequest(CombinedSearchDocumentString, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CombinedSearch", "query", variables);
+    },
+    FetchCodeContext(variables, requestHeaders) {
+      return withWrapper((wrappedRequestHeaders) => client.rawRequest(FetchCodeContextDocumentString, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "FetchCodeContext", "query", variables);
+    },
     CliDocsGet(variables, requestHeaders) {
       return withWrapper((wrappedRequestHeaders) => client.rawRequest(CliDocsGetDocumentString, variables, { ...requestHeaders, ...wrappedRequestHeaders }), "CliDocsGet", "query", variables);
     },
@@ -960,7 +1019,8 @@ var TOOL_NAMES = [
   "compare_packages",
   "list_package_docs",
   "fetch_package_doc",
-  "search_package_docs",
+  "search",
+  "fetch_code_context",
   "search_project_docs"
 ];
 var ToolNameSchema = z.enum(TOOL_NAMES);
@@ -1002,7 +1062,10 @@ class ConfigServiceImpl {
     return this.loadAndParseConfig(configPath, GlobalConfigSchema);
   }
   async loadProjectConfig() {
-    let currentDir = this.fs.getCwd();
+    return this.loadProjectConfigFrom(this.fs.getCwd());
+  }
+  async loadProjectConfigFrom(startDir) {
+    let currentDir = startDir;
     while (true) {
       const configPath = this.fs.joinPath(currentDir, PROJECT_CONFIG_FILE);
       const config = await this.loadAndParseConfig(configPath, ProjectConfigSchema);
@@ -1350,6 +1413,25 @@ class PkgseerServiceImpl {
     });
     return { data: result.data, errors: result.errors };
   }
+  async combinedSearch(packages, query, options) {
+    const result = await this.client.CombinedSearch({
+      packages,
+      query,
+      mode: options?.mode,
+      limit: options?.limit
+    });
+    return { data: result.data, errors: result.errors };
+  }
+  async fetchCodeContext(repoUrl, gitRef, filePath, options) {
+    const result = await this.client.FetchCodeContext({
+      repoUrl,
+      gitRef,
+      filePath,
+      startLine: options?.startLine,
+      endLine: options?.endLine
+    });
+    return { data: result.data, errors: result.errors };
+  }
 }
 // src/services/project-service.ts
 var PROJECT_NAME_REGEX = /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/;
@@ -2182,8 +2264,7 @@ function formatDocsList(docs) {
   for (const page of docs.pages) {
     if (!page || !page.id)
       continue;
-    const words = page.words ? ` (${formatNumber(page.words)} words)` : "";
-    lines.push(`  ${page.title}${words}`);
+    lines.push(`  ${page.title}`);
     lines.push(`    ID: ${page.id}`);
     lines.push("");
   }
@@ -2234,51 +2315,6 @@ function registerDocsListCommand(program) {
   });
 }
 // src/commands/docs/search.ts
-function summarizeSearchResults(results) {
-  const entries = results.entries ?? [];
-  const count = entries.length;
-  const totalMatches = entries.reduce((acc, e) => acc + (e?.matchCount ?? 0), 0);
-  const lines = [];
-  lines.push(`Results: ${count} page${count === 1 ? "" : "s"} | matches: ${totalMatches}`);
-  lines.push("");
-  for (const entry of entries.filter((e) => !!e)) {
-    lines.push(`- ${entry.title ?? entry.slug ?? "untitled"} (${entry.matchCount ?? 0} matches)`);
-  }
-  if (count === 0) {
-    lines.push("No matches. Try broader terms or fewer constraints.");
-  }
-  return lines.join(`
-`);
-}
-function buildDocRef(entry, searchResult) {
-  if (!entry?.slug)
-    return "";
-  let registry;
-  let packageName;
-  let version2;
-  if ("packageName" in entry && "registry" in entry && "version" in entry) {
-    registry = entry.registry;
-    packageName = entry.packageName;
-    version2 = entry.version;
-  } else {
-    const rawRegistry = "registry" in searchResult ? searchResult.registry : null;
-    registry = rawRegistry ? rawRegistry.toLowerCase() : null;
-    packageName = "packageName" in searchResult ? searchResult.packageName : null;
-    version2 = "version" in searchResult ? searchResult.version : null;
-  }
-  const parts = [];
-  if (registry)
-    parts.push(registry.toLowerCase());
-  if (packageName)
-    parts.push(packageName);
-  if (version2)
-    parts.push(version2);
-  else if (registry && packageName)
-    parts.push("latest");
-  if (entry.slug)
-    parts.push(entry.slug);
-  return parts.join("/");
-}
 var colors = {
   reset: "\x1B[0m",
   bold: "\x1B[1m",
@@ -2286,7 +2322,8 @@ var colors = {
   magenta: "\x1B[35m",
   cyan: "\x1B[36m",
   yellow: "\x1B[33m",
-  green: "\x1B[32m"
+  green: "\x1B[32m",
+  blue: "\x1B[34m"
 };
 function shouldUseColors(noColor) {
   if (noColor)
@@ -2295,219 +2332,420 @@ function shouldUseColors(noColor) {
     return false;
   return process.stdout.isTTY ?? false;
 }
-function applyHighlights(line, highlights, useColors) {
-  if (!highlights || highlights.length === 0 || !useColors) {
-    return line;
-  }
-  const sorted = [...highlights].filter((h) => h && h.start != null && h.end != null).sort((a, b) => {
-    const aStart = a?.start ?? 0;
-    const bStart = b?.start ?? 0;
-    return bStart - aStart;
+function toSearchMode(mode) {
+  if (!mode)
+    return "ALL";
+  const map = {
+    all: "ALL",
+    code: "CODE",
+    docs: "DOCS"
+  };
+  return map[mode.toLowerCase()] ?? "ALL";
+}
+function parsePackageList(input2) {
+  return input2.split(",").map((spec) => {
+    const trimmed = spec.trim();
+    const atIndex = trimmed.lastIndexOf("@");
+    let regPkg;
+    let version2;
+    if (atIndex > 0) {
+      regPkg = trimmed.slice(0, atIndex);
+      version2 = trimmed.slice(atIndex + 1);
+    } else {
+      regPkg = trimmed;
+    }
+    const slashIndex = regPkg.indexOf("/");
+    if (slashIndex === -1) {
+      return {
+        registry: "NPM",
+        name: regPkg,
+        version: version2
+      };
+    }
+    const beforeSlash = regPkg.slice(0, slashIndex);
+    const afterSlash = regPkg.slice(slashIndex + 1);
+    if (beforeSlash.startsWith("@")) {
+      return {
+        registry: "NPM",
+        name: regPkg,
+        version: version2
+      };
+    }
+    return {
+      registry: toGraphQLRegistry(beforeSlash),
+      name: afterSlash,
+      version: version2
+    };
   });
-  let result = line;
-  for (const h of sorted) {
-    if (!h || h.start == null || h.end == null)
-      continue;
-    const before = result.slice(0, h.start);
-    const match = result.slice(h.start, h.end);
-    const after = result.slice(h.end);
-    result = `${before}${colors.bold}${colors.magenta}${match}${colors.reset}${after}`;
+}
+function formatTypeBadge(type, useColors) {
+  const typeStr = type ?? "DOC";
+  if (useColors) {
+    const color = typeStr === "CODE" ? colors.magenta : colors.cyan;
+    return `${color}[${typeStr}]${colors.reset}`;
   }
-  return result;
+  return `[${typeStr}]`;
 }
-function formatEntry(entry, searchResult, useColors) {
+function formatEntry(entry, useColors) {
   if (!entry)
     return "";
   const lines = [];
-  const ref = buildDocRef(entry, searchResult);
-  const matchInfo = entry.matchCount && entry.matchCount > 0 ? ` (${entry.matchCount} match${entry.matchCount > 1 ? "es" : ""})` : "";
-  if (useColors) {
-    lines.push(`${colors.cyan}${ref}${colors.reset}: ${colors.bold}${entry.title}${colors.reset}${colors.dim}${matchInfo}${colors.reset}`);
-  } else {
-    lines.push(`${ref}: ${entry.title}${matchInfo}`);
-  }
-  const matches = entry.matches ?? [];
-  for (const match of matches) {
-    if (!match?.context)
-      continue;
-    const ctx = match.context;
-    for (const beforeLine of ctx.before ?? []) {
-      if (beforeLine) {
-        const prefix = useColors ? colors.dim : "";
-        const suffix = useColors ? colors.reset : "";
-        lines.push(`  ${prefix}${beforeLine}${suffix}`);
+  const badge = formatTypeBadge(entry.type, useColors);
+  if (entry.type === "CODE") {
+    const title = entry.title ?? "Unknown";
+    const location = entry.filePath ? `${entry.filePath}:${entry.startLine ?? "?"}-${entry.endLine ?? "?"}` : "";
+    const lang = entry.language ? ` • ${entry.language}` : "";
+    if (useColors) {
+      lines.push(`${badge} ${colors.bold}${title}${colors.reset}`);
+      if (location) {
+        lines.push(`  ${colors.dim}${location}${lang}${colors.reset}`);
       }
-    }
-    for (const matchedLine of ctx.matchedLines ?? []) {
-      if (matchedLine?.content) {
-        const highlighted = applyHighlights(matchedLine.content, matchedLine.highlights, useColors);
-        lines.push(`  ${highlighted}`);
+    } else {
+      lines.push(`${badge} ${title}`);
+      if (location) {
+        lines.push(`  ${location}${lang}`);
       }
     }
-    for (const afterLine of ctx.after ?? []) {
-      if (afterLine) {
-        const prefix = useColors ? colors.dim : "";
-        const suffix = useColors ? colors.reset : "";
-        lines.push(`  ${prefix}${afterLine}${suffix}`);
+  } else {
+    const title = entry.title ?? "Untitled";
+    const ref = entry.pageId ?? entry.sourceUrl ?? "";
+    if (useColors) {
+      lines.push(`${badge} ${colors.bold}${title}${colors.reset}`);
+      if (ref) {
+        lines.push(`  ${colors.dim}${ref}${colors.reset}`);
+      }
+    } else {
+      lines.push(`${badge} ${title}`);
+      if (ref) {
+        lines.push(`  ${ref}`);
       }
     }
+  }
+  if (entry.snippet) {
     lines.push("");
+    const snippetLines = entry.snippet.split(`
+`).slice(0, 5);
+    for (const line of snippetLines) {
+      if (useColors) {
+        lines.push(`  ${colors.dim}${line}${colors.reset}`);
+      } else {
+        lines.push(`  ${line}`);
+      }
+    }
   }
+  lines.push("");
   return lines.join(`
 `);
 }
+function formatPackageHeader(entry, prevEntry, useColors) {
+  const pkg = entry?.packageName ?? "unknown";
+  const registry = entry?.registry?.toLowerCase() ?? "npm";
+  const prevPkg = prevEntry?.packageName;
+  const prevRegistry = prevEntry?.registry?.toLowerCase();
+  if (pkg === prevPkg && registry === prevRegistry) {
+    return "";
+  }
+  const header = `${pkg} (${registry})`;
+  const separator = "═".repeat(Math.min(50, header.length + 10));
+  if (useColors) {
+    return `
+${colors.yellow}${header}${colors.reset}
+${colors.dim}${separator}${colors.reset}
+`;
+  }
+  return `
+${header}
+${separator}
+`;
+}
 function formatSearchResults(results, useColors) {
   const entries = results.entries ?? [];
   if (entries.length === 0) {
-    return "No matching documentation found. Try broader terms or fewer constraints.";
+    return "No results found. Try broader terms or different packages.";
+  }
+  const lines = [];
+  let prevEntry = null;
+  for (const entry of entries) {
+    if (!entry)
+      continue;
+    const header = formatPackageHeader(entry, prevEntry, useColors);
+    if (header) {
+      lines.push(header);
+    }
+    lines.push(formatEntry(entry, useColors));
+    prevEntry = entry;
+  }
+  const codeCount = entries.filter((e) => e?.type === "CODE").length;
+  const docCount = entries.filter((e) => e?.type === "DOC" || e?.type === "REPO_DOC").length;
+  if (useColors) {
+    lines.push(`${colors.dim}───────────────────────────────────────────────────${colors.reset}`);
+    lines.push(`${colors.dim}Results: ${entries.length} total (${codeCount} code, ${docCount} docs)${colors.reset}`);
+  } else {
+    lines.push("───────────────────────────────────────────────────");
+    lines.push(`Results: ${entries.length} total (${codeCount} code, ${docCount} docs)`);
+  }
+  const indexingWarnings = formatIndexingWarnings(results.indexingStatus);
+  if (indexingWarnings) {
+    lines.push("");
+    lines.push(indexingWarnings);
   }
-  const formatted = entries.filter((e) => e != null).map((entry) => formatEntry(entry, results, useColors));
-  return formatted.join(`
+  return lines.join(`
 `);
 }
 function formatRefsOnly(results) {
   const entries = results.entries ?? [];
-  return entries.filter((e) => e != null).map((entry) => buildDocRef(entry, results)).join(`
+  return entries.filter((e) => e != null).map((entry) => {
+    if (!entry)
+      return "";
+    if (entry.type === "CODE") {
+      return `${entry.repoUrl ?? ""}:${entry.filePath ?? ""}:${entry.startLine ?? ""}`;
+    }
+    return entry.pageId ?? entry.id ?? "";
+  }).filter((s) => s !== "").join(`
 `);
 }
 function formatCount(results) {
   const entries = results.entries ?? [];
-  return entries.filter((e) => e != null).map((entry) => {
+  const counts = new Map;
+  for (const entry of entries) {
     if (!entry)
-      return "";
-    const ref = buildDocRef(entry, results);
-    return `${ref}: ${entry.matchCount ?? 0}`;
-  }).filter((s) => s !== "").join(`
+      continue;
+    const key = `${entry.packageName ?? "unknown"}@${entry.registry?.toLowerCase() ?? "npm"}`;
+    const current = counts.get(key) ?? { code: 0, docs: 0 };
+    if (entry.type === "CODE") {
+      current.code++;
+    } else {
+      current.docs++;
+    }
+    counts.set(key, current);
+  }
+  return Array.from(counts.entries()).map(([pkg, { code, docs }]) => `${pkg}: ${code} code, ${docs} docs`).join(`
 `);
 }
-function slimSearchResults(results) {
+function formatIndexingWarnings(indexingStatus) {
+  if (!indexingStatus || indexingStatus.length === 0)
+    return null;
+  const warnings = [];
+  for (const status of indexingStatus) {
+    if (!status)
+      continue;
+    const pkg = `${status.packageName}@${status.version ?? "latest"}`;
+    if (status.codeStatus && status.codeStatus !== "INDEXED") {
+      warnings.push(`  - ${pkg}: code ${status.codeStatus.toLowerCase()}`);
+    }
+    if (status.docsStatus && status.docsStatus !== "INDEXED") {
+      warnings.push(`  - ${pkg}: docs ${status.docsStatus.toLowerCase()}`);
+    }
+  }
+  if (warnings.length === 0)
+    return null;
+  return `Note: Some packages are not fully indexed:
+` + warnings.join(`
+`) + `
+Results may be incomplete.`;
+}
+var LANG_ABBREV = {
+  javascript: "js",
+  typescript: "ts",
+  python: "py",
+  markdown: "md"
+};
+function abbrevLang(lang) {
+  if (!lang)
+    return "";
+  const lower = lang.toLowerCase();
+  return LANG_ABBREV[lower] ?? lower;
+}
+function truncate(text, maxLen) {
+  if (text.length <= maxLen)
+    return text;
+  return text.slice(0, maxLen - 3) + "...";
+}
+function formatEntryCompact(entry, useColors) {
+  if (!entry)
+    return "";
+  const badge = formatTypeBadge(entry.type, useColors);
+  let header;
+  if (entry.type === "CODE") {
+    const loc = entry.filePath ? `${entry.filePath}:${entry.startLine ?? "?"}-${entry.endLine ?? "?"}` : "";
+    const lang = abbrevLang(entry.language);
+    const title = entry.title && entry.title !== "Unnamed" ? ` ${entry.title}` : "";
+    header = `${badge} ${loc}${lang ? ` ${lang}` : ""}${title}`;
+  } else {
+    const title = entry.title ?? "Untitled";
+    const ref = entry.pageId ? ` (${entry.pageId})` : "";
+    header = `${badge} ${title}${ref}`;
+  }
+  let snippet = "";
+  if (entry.snippet) {
+    const firstLine = entry.snippet.split(`
+`).map((l) => l.trim()).find((l) => l.length > 0);
+    if (firstLine) {
+      snippet = `  ${truncate(firstLine, 80)}`;
+      if (useColors) {
+        snippet = `  ${colors.dim}${truncate(firstLine, 80)}${colors.reset}`;
+      }
+    }
+  }
+  return snippet ? `${header}
+${snippet}` : header;
+}
+function formatPackageHeaderCompact(entry, prevEntry, useColors) {
+  const pkg = entry?.packageName ?? "unknown";
+  const registry = entry?.registry?.toLowerCase() ?? "npm";
+  const prevPkg = prevEntry?.packageName;
+  const prevRegistry = prevEntry?.registry?.toLowerCase();
+  if (pkg === prevPkg && registry === prevRegistry) {
+    return "";
+  }
+  const header = `${pkg} (${registry})`;
+  if (useColors) {
+    return `
+${colors.yellow}${header}${colors.reset}`;
+  }
+  return `
+${header}`;
+}
+function formatSearchResultsCompact(results, useColors) {
   const entries = results.entries ?? [];
-  return entries.filter((e) => e != null).map((entry) => {
+  if (entries.length === 0) {
+    return "No results. Try broader terms or different packages.";
+  }
+  const lines = [];
+  let prevEntry = null;
+  for (const entry of entries) {
     if (!entry)
-      return null;
-    return {
-      ref: buildDocRef(entry, results),
-      title: entry.title ?? "",
-      matchCount: entry.matchCount ?? 0,
-      matches: entry.matches?.filter((m) => m?.context).map((m) => {
-        if (!m?.context)
-          return null;
-        return {
-          before: (m.context.before ?? []).filter((l) => l != null),
-          lines: (m.context.matchedLines ?? []).filter((l) => l?.content).map((l) => l?.content ?? ""),
-          after: (m.context.after ?? []).filter((l) => l != null)
-        };
-      }).filter((m) => m != null)
-    };
-  }).filter((e) => e != null);
+      continue;
+    const header = formatPackageHeaderCompact(entry, prevEntry, useColors);
+    if (header) {
+      lines.push(header);
+    }
+    lines.push(formatEntryCompact(entry, useColors));
+    prevEntry = entry;
+  }
+  const codeCount = entries.filter((e) => e?.type === "CODE").length;
+  const docCount = entries.filter((e) => e?.type === "DOC" || e?.type === "REPO_DOC").length;
+  lines.push(`
+${entries.length} results (${codeCount} code, ${docCount} docs)`);
+  const indexingWarnings = formatIndexingWarnings(results.indexingStatus);
+  if (indexingWarnings) {
+    lines.push(indexingWarnings);
+  }
+  return lines.join(`
+`);
+}
+function summarizeSearchResults(results) {
+  const entries = results.entries ?? [];
+  const codeCount = entries.filter((e) => e?.type === "CODE").length;
+  const docCount = entries.filter((e) => e?.type === "DOC" || e?.type === "REPO_DOC").length;
+  const lines = [];
+  lines.push(`Results: ${entries.length} total | ${codeCount} code | ${docCount} docs`);
+  lines.push("");
+  const byPackage = new Map;
+  for (const entry of entries) {
+    if (!entry)
+      continue;
+    const key = `${entry.packageName ?? "unknown"} (${entry.registry?.toLowerCase() ?? "npm"})`;
+    const list = byPackage.get(key) ?? [];
+    list.push(entry);
+    byPackage.set(key, list);
+  }
+  for (const [pkg, pkgEntries] of byPackage) {
+    const pkgCode = pkgEntries.filter((e) => e?.type === "CODE").length;
+    const pkgDocs = pkgEntries.filter((e) => e?.type === "DOC" || e?.type === "REPO_DOC").length;
+    lines.push(`- ${pkg}: ${pkgCode} code, ${pkgDocs} docs`);
+  }
+  if (entries.length === 0) {
+    lines.push("No results. Try broader terms or different packages.");
+  }
+  return lines.join(`
+`);
 }
 async function docsSearchAction(queryArg, options, deps) {
-  const { pkgseerService, config } = deps;
-  const providedTerms = Array.isArray(queryArg) ? queryArg : queryArg ? [queryArg] : [];
-  const terms = providedTerms.concat(options.terms ?? []);
-  if (!terms.length) {
-    outputError("Search terms required. Provide terms as argument or with --terms", options.json ?? false);
+  const { pkgseerService } = deps;
+  const query = Array.isArray(queryArg) ? queryArg.join(" ") : queryArg ?? "";
+  if (!query.trim()) {
+    outputError("Search query required. Provide query as argument.", options.json ?? false);
     return;
   }
-  const contextBefore = options.context ? Number.parseInt(options.context, 10) : options.before ? Number.parseInt(options.before, 10) : 2;
-  const contextAfter = options.context ? Number.parseInt(options.context, 10) : options.after ? Number.parseInt(options.after, 10) : 2;
-  const maxMatches = options.maxMatches ? Number.parseInt(options.maxMatches, 10) : 5;
-  const limit = options.limit ? Number.parseInt(options.limit, 10) : 25;
-  const matchMode = options.match_mode?.toUpperCase() || options.mode?.toUpperCase() || undefined;
-  const useColors = shouldUseColors(options.noColor);
-  const project = options.project ?? config.project;
-  const packageName = options.package;
-  if (packageName) {
-    const registry = toGraphQLRegistry(options.registry ?? "npm");
-    const result = await pkgseerService.cliDocsSearch(registry, packageName, {
-      keywords: terms,
-      matchMode,
-      limit,
-      version: options.pkgVersion,
-      contextLinesBefore: contextBefore,
-      contextLinesAfter: contextAfter,
-      maxMatches
-    });
-    handleErrors(result.errors, options.json ?? false);
-    if (!result.data.searchPackageDocs) {
-      outputError(`No documentation found for ${packageName} in ${options.registry ?? "npm"}`, options.json ?? false);
-      return;
-    }
-    outputResults(result.data.searchPackageDocs, options, useColors);
+  if (!options.packages) {
+    outputError(`Package(s) required. Use -P or --packages:
+` + `  -P express              Single package (assumes npm)
+` + `  -P express,lodash       Multiple packages
+` + `  -P pypi/django          With registry prefix
+` + "  -P express@4.18.2       With version", options.json ?? false);
     return;
   }
-  if (project) {
-    const result = await pkgseerService.cliProjectDocsSearch(project, {
-      keywords: terms,
-      matchMode,
-      limit,
-      contextLinesBefore: contextBefore,
-      contextLinesAfter: contextAfter,
-      maxMatches
-    });
-    handleErrors(result.errors, options.json ?? false);
-    if (!result.data.searchProjectDocs) {
-      outputError(`Project not found: ${project}`, options.json ?? false);
-      return;
-    }
-    outputResults(result.data.searchProjectDocs, options, useColors);
+  const packages = parsePackageList(options.packages);
+  const limit = options.limit ? Number.parseInt(options.limit, 10) : 25;
+  const mode = toSearchMode(options.mode);
+  const useColors = shouldUseColors(options.noColor);
+  const result = await pkgseerService.combinedSearch(packages, query, {
+    mode,
+    limit
+  });
+  handleErrors(result.errors, options.json ?? false);
+  if (!result.data.combinedSearch) {
+    outputError("No results returned. Check package names and registries.", options.json ?? false);
     return;
   }
-  outputError(`No project configured. Either:
-` + `  - Add project to pkgseer.yml
-` + `  - Use --project <name> to specify a project
-` + "  - Use --package <name> to search a specific package", options.json ?? false);
+  outputResults(result.data.combinedSearch, options, useColors);
 }
 function outputResults(results, options, useColors) {
   const format = options.json ? "json" : options.format ?? "human";
   if (format === "json") {
-    output(slimSearchResults(results), true);
+    output(results, true);
   } else if (options.refsOnly) {
     console.log(formatRefsOnly(results));
   } else if (options.count) {
     console.log(formatCount(results));
   } else if (format === "summary") {
     console.log(summarizeSearchResults(results));
-  } else {
+  } else if (options.verbose) {
     console.log(formatSearchResults(results, useColors));
+  } else {
+    console.log(formatSearchResultsCompact(results, useColors));
   }
 }
-var SEARCH_DESCRIPTION = `Search documentation with grep-like output.
+var SEARCH_DESCRIPTION = `Search code and documentation across packages.
 
-Searches across package or project documentation with keyword
-or freeform query support. Shows matching lines with context
-and highlights matched terms.
-
-By default, searches project documentation if project is
-configured in pkgseer.yml. Use --package to search a specific
-package instead.
+Searches both code (functions, classes) and documentation pages
+using the combined search endpoint. Returns results with snippets
+showing matches.
 
 Examples:
-  # Search with context (like grep)
-  pkgseer docs search "error handling" --package express
-  pkgseer docs search log --package express -C 3
+  # Search a single package (code + docs)
+  pkgseer docs search "error handling" -P express
+
+  # Search code only
+  pkgseer docs search "Router.use" -P express --mode code
+
+  # Search docs only
+  pkgseer docs search "middleware" -P express --mode docs
 
-  # Multiple terms (OR by default)
-  pkgseer docs search -t "middleware,routing" --package express
+  # Search multiple packages
+  pkgseer docs search "auth" -P express,passport
 
-  # Strict matching (AND mode)
-  pkgseer docs search -t "error,middleware" --match-mode all --package express
+  # With registry prefix (for non-npm packages)
+  pkgseer docs search "orm" -P pypi/django,pypi/sqlalchemy
+
+  # With specific version
+  pkgseer docs search "routing" -P express@4.18.2
 
   # Output for piping
-  pkgseer docs search log --package express --refs-only | \\
-    xargs -I{} pkgseer docs get express {}
+  pkgseer docs search "routing" -P express --refs-only
 
-  # Count matches
-  pkgseer docs search error --package express --count`;
+  # JSON output
+  pkgseer docs search "error" -P express --json`;
 function addSearchOptions(cmd) {
-  return cmd.option("-p, --package <name>", "Search specific package (overrides project)").option("-r, --registry <registry>", "Package registry (with --package)", "npm").option("-v, --pkg-version <version>", "Package version (with --package)").option("--project <name>", "Project name (overrides config)").option("-t, --terms <words>", "Comma-separated search terms", (val) => val.split(",").map((s) => s.trim())).option("-l, --limit <n>", "Max results (default: 25)").option("-A, --after <n>", "Lines of context after match (default: 2)").option("-B, --before <n>", "Lines of context before match (default: 2)").option("-C, --context <n>", "Lines of context before and after match").option("--max-matches <n>", "Max matches per page (default: 5)").option("--match-mode <mode>", "How to combine terms: any/or (default) or all/and").option("--refs-only", "Output only page references (for piping)").option("--count", "Output only match counts per page").option("--format <format>", "Output format: human|summary|json", "human").option("--no-color", "Disable colored output").option("--json", "Output as JSON");
+  return cmd.option("-P, --packages <packages>", "Packages to search (comma-separated). Format: name or registry/name[@version]. Examples: express | express,lodash | pypi/django@4.2").option("-m, --mode <mode>", "Search mode: all (default), code, docs").option("-l, --limit <n>", "Max results (default: 25)").option("-v, --verbose", "Expanded output with more details").option("--refs-only", "Output only references (for piping)").option("--count", "Output result counts by package").option("--format <format>", "Output format: human|summary|json", "human").option("--no-color", "Disable colored output").option("--json", "Output as JSON");
 }
 function registerDocsSearchCommand(program) {
-  const cmd = program.command("search [terms...]").summary("Search documentation").description(SEARCH_DESCRIPTION);
-  addSearchOptions(cmd).action(async (terms, options) => {
+  const cmd = program.command("search [query...]").summary("Search code and documentation").description(SEARCH_DESCRIPTION);
+  addSearchOptions(cmd).action(async (query, options) => {
     await withCliErrorHandling(options.json ?? false, async () => {
       const deps = await createContainer();
-      await docsSearchAction(terms, options, deps);
+      await docsSearchAction(query, options, deps);
     });
   });
 }
@@ -2586,22 +2824,13 @@ function getCodexConfigPaths(fs, scope) {
 function getClaudeCodeConfigPaths(fs, scope) {
   if (scope === "project") {
     const cwd = fs.getCwd();
-    const configPath2 = fs.joinPath(cwd, ".claude-code", "mcp.json");
-    const backupPath2 = fs.joinPath(cwd, ".claude-code", "mcp.json.bak");
+    const configPath2 = fs.joinPath(cwd, ".mcp.json");
+    const backupPath2 = fs.joinPath(cwd, ".mcp.json.bak");
     return { configPath: configPath2, backupPath: backupPath2 };
   }
-  const platform = process.platform;
-  let configPath;
-  let backupPath;
-  if (platform === "win32") {
-    const appData = process.env.APPDATA || fs.joinPath(fs.getHomeDir(), "AppData", "Roaming");
-    configPath = fs.joinPath(appData, "Claude Code", "mcp.json");
-    backupPath = fs.joinPath(appData, "Claude Code", "mcp.json.bak");
-  } else {
-    const home = fs.getHomeDir();
-    configPath = fs.joinPath(home, ".claude-code", "mcp.json");
-    backupPath = fs.joinPath(home, ".claude-code", "mcp.json.bak");
-  }
+  const home = fs.getHomeDir();
+  const configPath = fs.joinPath(home, ".claude.json");
+  const backupPath = fs.joinPath(home, ".claude.json.bak");
   return { configPath, backupPath };
 }
 async function parseConfigFile(fs, path) {
@@ -2685,14 +2914,64 @@ args = ["-y", "@pkgseer/cli", "mcp", "start"]`;
     };
     console.log(JSON.stringify(configExample, null, 2));
   }
-  if ((tool === "cursor" || tool === "codex" || tool === "claude-code") && scope === "project") {
-    const dirName = tool === "cursor" ? ".cursor" : tool === "codex" ? ".codex" : ".claude-code";
+  if ((tool === "cursor" || tool === "codex") && scope === "project") {
+    const dirName = tool === "cursor" ? ".cursor" : ".codex";
     console.log(dim(`
 Note: Create the ${dirName} directory if it doesn't exist.`, useColors));
   }
   console.log(dim(`
 After editing, restart your AI assistant to activate the MCP server.`, useColors));
 }
+async function isCliAvailable(shellService, command) {
+  try {
+    const checkCommand = process.platform === "win32" ? `where ${command}` : `which ${command}`;
+    await shellService.execute(checkCommand, process.cwd());
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function setupClaudeCodeViaCli(shellService, scope) {
+  try {
+    const command = `claude mcp add --transport stdio --scope ${scope} pkgseer -- npx -y @pkgseer/cli mcp start`;
+    await shellService.execute(command, process.cwd());
+    return { success: true };
+  } catch (err) {
+    return {
+      success: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+async function setupCodexViaCli(shellService) {
+  try {
+    const command = "codex mcp add pkgseer -- npx -y @pkgseer/cli mcp start";
+    await shellService.execute(command, process.cwd());
+    return { success: true };
+  } catch (err) {
+    return {
+      success: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+function showAvailableTools(hasProject, useColors) {
+  console.log(`
+Available MCP tools:`);
+  console.log("  • package_summary - Get package overview");
+  console.log("  • package_vulnerabilities - Check for security issues");
+  console.log("  • package_quality - Get quality score");
+  console.log("  • package_dependencies - List dependencies");
+  console.log("  • compare_packages - Compare multiple packages");
+  console.log("  • list_package_docs - List documentation pages");
+  console.log("  • fetch_package_doc - Fetch documentation content");
+  console.log("  • search_package_docs - Search package documentation");
+  console.log("  • search_project_docs - Search docs across project dependencies");
+  if (!hasProject) {
+    console.log(dim(`
+Tip: Create pkgseer.yml to enable automatic project detection for search_project_docs.`, useColors));
+  }
+}
 async function mcpInitAction(deps) {
   const { fileSystemService: fs, promptService, hasProject } = deps;
   const useColors = shouldUseColors2();
@@ -2743,49 +3022,86 @@ Run ${highlight("pkgseer project init", useColors)} first, then ${highlight("pkg
   }
   let scope;
   if (tool === "cursor" || tool === "codex" || tool === "claude-code") {
-    const projectPath = tool === "cursor" ? ".cursor/mcp.json" : tool === "codex" ? ".codex/config.toml" : ".claude-code/mcp.json";
-    const globalPath = tool === "cursor" ? "~/.cursor/mcp.json" : tool === "codex" ? "~/.codex/config.toml" : "~/.claude-code/mcp.json";
-    if (hasProject) {
-      scope = await promptService.select("Where should the MCP config be created?", [
+    const projectPath = tool === "cursor" ? ".cursor/mcp.json" : tool === "codex" ? ".codex/config.toml" : ".mcp.json";
+    const globalPath = tool === "cursor" ? "~/.cursor/mcp.json" : tool === "codex" ? "~/.codex/config.toml" : "~/.claude.json";
+    if (tool === "codex") {
+      console.log(dim(`
+Codex uses user-level configuration.
+`, useColors));
+      scope = "global";
+    } else {
+      scope = await promptService.select("Where should the MCP server be installed?", [
         {
-          value: "project",
-          name: `Project (${projectPath}) – recommended`,
-          description: "Uses project token; enables docs search for your packages"
+          value: "global",
+          name: `User-level (${globalPath}) – recommended`,
+          description: "Works across all projects. Use project_directory param for project features."
         },
         {
-          value: "global",
-          name: `Global (${globalPath})`,
-          description: "Works everywhere but without project-specific features"
+          value: "project",
+          name: `Project-level (${projectPath})`,
+          description: "Scoped to this project only."
         }
       ]);
-    } else {
-      console.log(dim(`
-Using global config (no pkgseer.yml found).
-`, useColors));
-      scope = "global";
     }
   }
   let configPath;
   let backupPath;
-  if (tool === "cursor") {
+  const { shellService } = deps;
+  if (tool === "claude-code") {
     if (!scope) {
       scope = "global";
     }
-    const paths = getCursorConfigPaths(fs, scope);
+    const claudeAvailable = await isCliAvailable(shellService, "claude");
+    if (claudeAvailable) {
+      console.log(dim(`
+Using Claude Code CLI to add MCP server...
+`, useColors));
+      const cliScope = scope === "global" ? "user" : "project";
+      const result = await setupClaudeCodeViaCli(shellService, cliScope);
+      if (result.success) {
+        console.log(success("PkgSeer MCP server configured for Claude Code!", useColors));
+        console.log(dim(`
+The MCP server has been registered. It should be available immediately.`, useColors));
+        showAvailableTools(hasProject, useColors);
+        return;
+      }
+      console.log(dim(`
+CLI setup failed: ${result.error}
+Falling back to file editing...
+`, useColors));
+    }
+    const paths = getClaudeCodeConfigPaths(fs, scope);
     configPath = paths.configPath;
     backupPath = paths.backupPath;
   } else if (tool === "codex") {
     if (!scope) {
-      scope = hasProject ? "project" : "global";
+      scope = "global";
+    }
+    const codexAvailable = await isCliAvailable(shellService, "codex");
+    if (codexAvailable) {
+      console.log(dim(`
+Using Codex CLI to add MCP server...
+`, useColors));
+      const result = await setupCodexViaCli(shellService);
+      if (result.success) {
+        console.log(success("PkgSeer MCP server configured for Codex CLI!", useColors));
+        console.log(dim(`
+The MCP server has been registered. It should be available immediately.`, useColors));
+        showAvailableTools(hasProject, useColors);
+        return;
+      }
+      console.log(dim(`
+CLI setup failed: ${result.error}
+`, useColors));
     }
     const paths = getCodexConfigPaths(fs, scope);
     showManualInstructions("codex", scope, paths.configPath, useColors);
     return;
-  } else if (tool === "claude-code") {
+  } else if (tool === "cursor") {
     if (!scope) {
       scope = "global";
     }
-    const paths = getClaudeCodeConfigPaths(fs, scope);
+    const paths = getCursorConfigPaths(fs, scope);
     configPath = paths.configPath;
     backupPath = paths.backupPath;
   } else {
@@ -2862,31 +3178,19 @@ Config file: ${highlight(configPath, useColors)}`);
 Next steps:
   1. Restart your AI assistant to activate the MCP server
   2. Test by asking your assistant about packages`, useColors));
-  console.log(`
-Available MCP tools:`);
-  console.log("  • package_summary - Get package overview");
-  console.log("  • package_vulnerabilities - Check for security issues");
-  console.log("  • package_quality - Get quality score");
-  console.log("  • package_dependencies - List dependencies");
-  console.log("  • compare_packages - Compare multiple packages");
-  console.log("  • list_package_docs - List documentation pages");
-  console.log("  • fetch_package_doc - Fetch documentation content");
-  console.log("  • search_package_docs - Search package documentation");
-  if (hasProject) {
-    console.log("  • search_project_docs - Search your project's docs");
-  }
+  showAvailableTools(hasProject, useColors);
 }
 var MCP_INIT_DESCRIPTION = `Configure PkgSeer's MCP server for your AI assistant.
 
 Guides you through:
   • Selecting your AI tool (Cursor IDE, Codex CLI, Claude Code)
-  • Choosing configuration location (project or global)
-  • Safely editing config files with automatic backup
+  • Choosing installation scope (user-level or project-level)
+  • Setting up via CLI commands or config file editing
 
-Project-level config (recommended):
-  • Uses your project token for authenticated features
-  • Enables search_project_docs (search your project's packages)
-  • Portable with your project`;
+User-level (recommended):
+  • Works across all your projects
+  • Use project_directory parameter for project-specific features
+  • Automatically updated when using npx`;
 function registerMcpInitCommand(mcpCommand) {
   mcpCommand.command("init").summary("Configure MCP server for AI assistants").description(MCP_INIT_DESCRIPTION).action(async () => {
     const deps = await createContainer();
@@ -2895,6 +3199,7 @@ function registerMcpInitCommand(mcpCommand) {
       fileSystemService: deps.fileSystemService,
       promptService: deps.promptService,
       configService: deps.configService,
+      shellService: deps.shellService,
       baseUrl: deps.baseUrl,
       hasProject
     });
@@ -3627,6 +3932,7 @@ ${highlight("✓", useColors)} Project setup complete!
       fileSystemService: deps.fileSystemService,
       promptService: deps.promptService,
       configService: deps.configService,
+      shellService: deps.shellService,
       baseUrl: deps.baseUrl,
       hasProject: hasProjectNow
     });
@@ -3921,7 +4227,7 @@ var argsSchema = {
 function createComparePackagesTool(pkgseerService) {
   return {
     name: "compare_packages",
-    description: 'Compares 2-10 packages across metadata, quality, and security. Example: [{"registry":"npm","name":"react","version":"18.2.0"},{"registry":"pypi","name":"requests"}].',
+    description: "Compare 2-10 packages side-by-side. Use this when evaluating alternatives (e.g., react vs preact vs solid-js). " + "Returns for each package: quality score, download counts, vulnerability count, license, and latest version. " + "Supports cross-registry comparison (npm, pypi, hex). " + 'Format: [{"registry":"npm","name":"lodash"},{"registry":"npm","name":"underscore"}]',
     schema: argsSchema,
     handler: async ({ packages }, _extra) => {
       return withErrorHandling("compare packages", async () => {
@@ -3942,16 +4248,47 @@ function createComparePackagesTool(pkgseerService) {
     }
   };
 }
-// src/tools/fetch-package-doc.ts
+// src/tools/fetch-code-context.ts
 import { z as z4 } from "zod";
 var argsSchema2 = {
-  page_id: z4.string().max(500).describe("Globally unique documentation page identifier (from list_package_docs)")
+  repo_url: z4.string().min(1).describe("Repository URL (GitHub). Example: https://github.com/expressjs/express"),
+  git_ref: z4.string().min(1).describe("Git reference (tag, commit, or branch). Example: v4.18.2"),
+  file_path: z4.string().min(1).describe("Path to file in repository. Example: src/router/index.js"),
+  start_line: z4.number().int().positive().optional().describe("Starting line (1-indexed). If omitted, starts from line 1."),
+  end_line: z4.number().int().positive().optional().describe("Ending line. If omitted, returns to end of file.")
+};
+function createFetchCodeContextTool(pkgseerService) {
+  return {
+    name: "fetch_code_context",
+    description: "Fetch code content from a repository. Use this to expand code search results and see " + "more context around a match. Returns full file by default, or a specific line range. " + "Requires repo_url, git_ref (tag/commit/branch), and file_path from search results.",
+    schema: argsSchema2,
+    handler: async ({ repo_url, git_ref, file_path, start_line, end_line }, _extra) => {
+      return withErrorHandling("fetch code context", async () => {
+        const result = await pkgseerService.fetchCodeContext(repo_url, git_ref, file_path, {
+          startLine: start_line,
+          endLine: end_line
+        });
+        const graphqlError = handleGraphQLErrors(result.errors);
+        if (graphqlError)
+          return graphqlError;
+        if (!result.data.fetchCodeContext) {
+          return errorResult(`Code not found: ${file_path} at ${git_ref} in ${repo_url}. ` + "Check that the repository, file path, and git ref are correct.");
+        }
+        return textResult(JSON.stringify(result.data.fetchCodeContext, null, 2));
+      });
+    }
+  };
+}
+// src/tools/fetch-package-doc.ts
+import { z as z5 } from "zod";
+var argsSchema3 = {
+  page_id: z5.string().max(500).describe("Globally unique documentation page identifier (from list_package_docs)")
 };
 function createFetchPackageDocTool(pkgseerService) {
   return {
     name: "fetch_package_doc",
-    description: "Fetches the full content of a documentation page by globally unique page ID (from list_package_docs). Returns full metadata (title, content, format, breadcrumbs, source, base URL, last updated).",
-    schema: argsSchema2,
+    description: "Get full content of a documentation page. Requires page_id from list_package_docs. " + "Returns: title, full content (markdown/HTML), format type, navigation breadcrumbs, " + "source URL, and last updated timestamp. Use this when you need complete documentation, " + "not just search snippets.",
+    schema: argsSchema3,
     handler: async ({ page_id }, _extra) => {
       return withErrorHandling("fetch documentation page", async () => {
         const result = await pkgseerService.getDocPage(page_id);
@@ -3967,7 +4304,7 @@ function createFetchPackageDocTool(pkgseerService) {
   };
 }
 // src/tools/list-package-docs.ts
-var argsSchema3 = {
+var argsSchema4 = {
   registry: schemas.registry,
   package_name: schemas.packageName.describe("Name of the package to list documentation for"),
   version: schemas.version
@@ -3975,8 +4312,8 @@ var argsSchema3 = {
 function createListPackageDocsTool(pkgseerService) {
   return {
     name: "list_package_docs",
-    description: "Lists documentation pages for a package version. Returns page titles, globally unique IDs, and metadata. Use this to discover available documentation before fetching specific pages.",
-    schema: argsSchema3,
+    description: "Discover available documentation pages for a package. Start here before fetching or searching docs. " + "Returns: page titles, unique IDs (needed for fetch_package_doc), word counts, and update timestamps. " + "Workflow: list_package_docs → fetch_package_doc for full content, or search_package_docs to find specific topics.",
+    schema: argsSchema4,
     handler: async ({ registry, package_name, version: version2 }, _extra) => {
       return withErrorHandling("list package documentation", async () => {
         const result = await pkgseerService.listPackageDocs(toGraphQLRegistry2(registry), package_name, version2);
@@ -3992,13 +4329,13 @@ function createListPackageDocsTool(pkgseerService) {
   };
 }
 // src/tools/package-dependencies.ts
-import { z as z5 } from "zod";
-var argsSchema4 = {
+import { z as z6 } from "zod";
+var argsSchema5 = {
   registry: schemas.registry,
   package_name: schemas.packageName.describe("Name of the package to retrieve dependencies for"),
   version: schemas.version,
-  include_transitive: z5.boolean().optional().describe("Whether to include transitive dependency DAG"),
-  max_depth: z5.number().int().min(1).max(10).optional().describe("Maximum depth for transitive traversal (1-10)")
+  include_transitive: z6.boolean().optional().describe("Whether to include transitive dependency DAG"),
+  max_depth: z6.number().int().min(1).max(10).optional().describe("Maximum depth for transitive traversal (1-10)")
 };
 function decodeDag(rawDag) {
   if (!rawDag || typeof rawDag !== "object")
@@ -4075,8 +4412,8 @@ function buildEdgeDepths(decodedDag, rootId) {
 function createPackageDependenciesTool(pkgseerService) {
   return {
     name: "package_dependencies",
-    description: "Retrieves direct and transitive dependencies for a package version. Options: include_transitive (bool) and max_depth (1-10). Transitive output includes a DAG (`n/e/v` keys) decoded into readable nodes/edges with depth and counts; raw DAG is preserved alongside decoded form.",
-    schema: argsSchema4,
+    description: "Analyze package dependencies. By default returns direct dependencies only. " + "Set include_transitive=true to get the full dependency tree (use max_depth to limit large trees). " + "Returns: dependency names, version constraints, and for transitive deps, a graph with depth levels. " + "Use this to understand complexity before adding a package, or to find nested dependencies.",
+    schema: argsSchema5,
     handler: async ({ registry, package_name, version: version2, include_transitive, max_depth }, _extra) => {
       return withErrorHandling("fetch package dependencies", async () => {
         const result = await pkgseerService.getPackageDependencies(toGraphQLRegistry2(registry), package_name, version2, include_transitive, max_depth);
@@ -4114,7 +4451,7 @@ function createPackageDependenciesTool(pkgseerService) {
   };
 }
 // src/tools/package-quality.ts
-var argsSchema5 = {
+var argsSchema6 = {
   registry: schemas.registry,
   package_name: schemas.packageName.describe("Name of the package to analyze"),
   version: schemas.version
@@ -4122,8 +4459,8 @@ var argsSchema5 = {
 function createPackageQualityTool(pkgseerService) {
   return {
     name: "package_quality",
-    description: "Retrieves quality score and rule-level breakdown for a package",
-    schema: argsSchema5,
+    description: "Evaluate package maintenance health and code quality. Use this to assess if a package is well-maintained " + "before adding it as a dependency. Returns: overall score (0-100), category scores (documentation, " + "testing, community, maintenance), and individual rule results with pass/fail status. " + "Useful for comparing quality between alternative packages.",
+    schema: argsSchema6,
     handler: async ({ registry, package_name, version: version2 }, _extra) => {
       return withErrorHandling("fetch package quality", async () => {
         const result = await pkgseerService.getPackageQuality(toGraphQLRegistry2(registry), package_name, version2);
@@ -4139,15 +4476,15 @@ function createPackageQualityTool(pkgseerService) {
   };
 }
 // src/tools/package-summary.ts
-var argsSchema6 = {
+var argsSchema7 = {
   registry: schemas.registry,
   package_name: schemas.packageName.describe("Name of the package to retrieve summary for")
 };
 function createPackageSummaryTool(pkgseerService) {
   return {
     name: "package_summary",
-    description: "Retrieves comprehensive package summary including metadata, versions, security advisories, and quickstart information",
-    schema: argsSchema6,
+    description: "Get a comprehensive overview of a package. Use this as your first tool when researching a package. " + "Returns: description, latest version, license, repository URL, download stats, " + "active security advisories count, and quickstart/installation instructions. " + "For deeper analysis, follow up with package_quality (maintenance health) or " + "package_vulnerabilities (security details).",
+    schema: argsSchema7,
     handler: async ({ registry, package_name }, _extra) => {
       return withErrorHandling("fetch package summary", async () => {
         const result = await pkgseerService.getPackageSummary(toGraphQLRegistry2(registry), package_name);
@@ -4163,7 +4500,7 @@ function createPackageSummaryTool(pkgseerService) {
   };
 }
 // src/tools/package-vulnerabilities.ts
-var argsSchema7 = {
+var argsSchema8 = {
   registry: schemas.registry,
   package_name: schemas.packageName.describe("Name of the package to inspect for vulnerabilities"),
   version: schemas.version
@@ -4171,8 +4508,8 @@ var argsSchema7 = {
 function createPackageVulnerabilitiesTool(pkgseerService) {
   return {
     name: "package_vulnerabilities",
-    description: "Retrieves vulnerability details for a package, including affected version ranges and upgrade guidance",
-    schema: argsSchema7,
+    description: "Check security vulnerabilities for a package. Use this before adding dependencies or when auditing existing ones. " + "Returns: list of CVEs/advisories with severity levels, affected version ranges, fixed versions, " + "and upgrade recommendations. If version is specified, shows only vulnerabilities affecting that version.",
+    schema: argsSchema8,
     handler: async ({ registry, package_name, version: version2 }, _extra) => {
       return withErrorHandling("fetch package vulnerabilities", async () => {
         const result = await pkgseerService.getPackageVulnerabilities(toGraphQLRegistry2(registry), package_name, version2);
@@ -4187,79 +4524,126 @@ function createPackageVulnerabilitiesTool(pkgseerService) {
     }
   };
 }
-// src/tools/search-package-docs.ts
-import { z as z6 } from "zod";
-var argsSchema8 = {
+// src/tools/search.ts
+import { z as z7 } from "zod";
+var packageInputSchema2 = z7.object({
   registry: schemas.registry,
-  package_name: schemas.packageName.describe("Name of the package to search documentation for"),
-  terms: z6.array(z6.string()).optional().describe("Search terms to match. Provide a few key words or phrases that should appear in results."),
-  match_mode: z6.enum(["any", "or", "all", "and"]).optional().describe('How to combine terms: "any" (OR) or "all" (AND).'),
-  include_snippets: z6.boolean().optional().describe("Include content excerpts around matches"),
-  limit: z6.number().int().min(1).max(100).optional().describe("Maximum number of results to return"),
-  version: schemas.version
+  name: z7.string().min(1).describe("Package name"),
+  version: z7.string().optional().describe("Specific version (defaults to latest)")
+});
+var argsSchema9 = {
+  packages: z7.array(packageInputSchema2).min(1).max(20).describe("Packages to search (1-20). Each package needs registry and name."),
+  query: z7.string().min(1).describe("Search query - natural language or keywords"),
+  mode: z7.enum(["all", "code", "docs"]).optional().describe('Search mode: "all" (default), "code" only, or "docs" only'),
+  limit: z7.number().int().min(1).max(100).optional().describe("Maximum results (default: 20)")
 };
-function createSearchPackageDocsTool(pkgseerService) {
+function toSearchMode2(mode) {
+  if (!mode)
+    return;
+  const map = {
+    all: "ALL",
+    code: "CODE",
+    docs: "DOCS"
+  };
+  return map[mode.toLowerCase()];
+}
+function formatIndexingWarnings2(indexingStatus) {
+  if (!indexingStatus || indexingStatus.length === 0)
+    return null;
+  const warnings = [];
+  for (const status of indexingStatus) {
+    if (!status)
+      continue;
+    const pkg = `${status.packageName}@${status.version ?? "latest"} (${status.registry?.toLowerCase() ?? "unknown"})`;
+    if (status.codeStatus && status.codeStatus !== "INDEXED") {
+      warnings.push(`  - ${pkg}: code ${status.codeStatus.toLowerCase()}`);
+    }
+    if (status.docsStatus && status.docsStatus !== "INDEXED") {
+      warnings.push(`  - ${pkg}: docs ${status.docsStatus.toLowerCase()}`);
+    }
+  }
+  if (warnings.length === 0)
+    return null;
+  return `
+Note: Some packages are not fully indexed:
+` + warnings.join(`
+`) + `
+Results may be incomplete. Retry later for more complete results.`;
+}
+function createSearchTool(pkgseerService) {
   return {
-    name: "search_package_docs",
-    description: "Searches package documentation using search terms and match modes (any/all). Returns ranked results with match context. Defaults to include_snippets=true.",
-    schema: argsSchema8,
-    handler: async ({
-      registry,
-      package_name,
-      terms,
-      match_mode,
-      include_snippets,
-      limit,
-      version: version2
-    }, _extra) => {
-      return withErrorHandling("search package documentation", async () => {
-        const normalizedTerms = terms?.map((term) => term.trim()).filter((term) => term.length > 0) ?? [];
-        if (normalizedTerms.length === 0) {
-          return errorResult("Search terms are required to run documentation search.");
+    name: "search",
+    description: "Search code and documentation across packages. Returns functions, classes, and documentation pages " + "matching your query. Use mode='code' for code only, mode='docs' for documentation only, or " + "mode='all' (default) for both. Provide 1-20 packages to search. Results include relevance scores " + "and snippets showing matches.",
+    schema: argsSchema9,
+    handler: async ({ packages, query, mode, limit }, _extra) => {
+      return withErrorHandling("search packages", async () => {
+        const normalizedQuery = query.trim();
+        if (normalizedQuery.length === 0) {
+          return errorResult("Search query is required.");
         }
-        const matchMode = match_mode === "all" || match_mode === "and" ? "AND" : match_mode === "any" || match_mode === "or" ? "OR" : undefined;
-        const includeSnippets = include_snippets ?? true;
-        const result = await pkgseerService.searchPackageDocs(toGraphQLRegistry2(registry), package_name, {
-          keywords: normalizedTerms,
-          matchMode,
-          includeSnippets,
-          limit,
-          version: version2
+        const graphqlPackages = packages.map((pkg) => ({
+          registry: toGraphQLRegistry2(pkg.registry),
+          name: pkg.name,
+          version: pkg.version
+        }));
+        const result = await pkgseerService.combinedSearch(graphqlPackages, normalizedQuery, {
+          mode: toSearchMode2(mode),
+          limit
         });
         const graphqlError = handleGraphQLErrors(result.errors);
         if (graphqlError)
           return graphqlError;
-        if (!result.data.searchPackageDocs) {
-          return errorResult(`No documentation found for ${package_name} in ${registry}`);
+        if (!result.data.combinedSearch) {
+          return errorResult("No search results returned. Check package names and registries.");
         }
-        if ((result.data.searchPackageDocs.entries ?? []).length === 0 && normalizedTerms.length > 0) {
-          return errorResult(`No documentation matched: ${normalizedTerms.join(", ")}. ` + "Try fewer or broader terms, or reduce match constraints.");
+        const searchResult = result.data.combinedSearch;
+        const entries = searchResult.entries ?? [];
+        if (entries.length === 0) {
+          return errorResult(`No results found for "${normalizedQuery}". ` + "Try broader terms or different packages.");
         }
-        return textResult(JSON.stringify(result.data.searchPackageDocs, null, 2));
+        let response = JSON.stringify(searchResult, null, 2);
+        const indexingWarning = formatIndexingWarnings2(searchResult.indexingStatus);
+        if (indexingWarning) {
+          response += indexingWarning;
+        }
+        return textResult(response);
       });
     }
   };
 }
 // src/tools/search-project-docs.ts
-import { z as z7 } from "zod";
-var argsSchema9 = {
-  project: z7.string().optional().describe("Project name to search. Optional if configured in pkgseer.yml; only needed to search a different project."),
-  terms: z7.array(z7.string()).optional().describe("Search terms to match. Provide a few key words or phrases that should appear in results."),
-  match_mode: z7.enum(["any", "or", "all", "and"]).optional().describe('How to combine terms: "any" (OR) or "all" (AND).'),
-  include_snippets: z7.boolean().optional().describe("Include content excerpts around matches"),
-  limit: z7.number().int().min(1).max(100).optional().describe("Maximum number of results to return")
+import { z as z8 } from "zod";
+var argsSchema10 = {
+  project_directory: z8.string().optional().describe("Directory to search for pkgseer.yml configuration. " + "Use this to specify which project's context to use when the MCP server " + "is installed at user level. Defaults to MCP server's working directory."),
+  project: z8.string().optional().describe("Project name to search. Overrides value from pkgseer.yml if provided."),
+  terms: z8.array(z8.string()).optional().describe("Search terms to match. Provide a few key words or phrases that should appear in results."),
+  match_mode: z8.enum(["any", "or", "all", "and"]).optional().describe('How to combine terms: "any" (OR) or "all" (AND).'),
+  include_snippets: z8.boolean().optional().describe("Include content excerpts around matches"),
+  limit: z8.number().int().min(1).max(100).optional().describe("Maximum number of results to return")
 };
 function createSearchProjectDocsTool(deps) {
-  const { pkgseerService, config } = deps;
+  const { pkgseerService, configService, defaultProjectDir } = deps;
   return {
     name: "search_project_docs",
-    description: "Searches documentation across all dependencies in a PkgSeer project using search terms and match modes (any/all). Returns ranked results from multiple packages. Uses project from pkgseer.yml config by default.",
-    schema: argsSchema9,
-    handler: async ({ project, terms, match_mode, include_snippets, limit }, _extra) => {
+    description: "Searches documentation across all dependencies in a PkgSeer project using search terms and match modes (any/all). Returns ranked results from multiple packages. Use project_directory to specify which project's context to use, or project to search a specific project directly.",
+    schema: argsSchema10,
+    handler: async ({
+      project_directory,
+      project,
+      terms,
+      match_mode,
+      include_snippets,
+      limit
+    }, _extra) => {
       return withErrorHandling("search project documentation", async () => {
-        const resolvedProject = project ?? config.project;
+        const targetDir = project_directory ?? defaultProjectDir;
+        const projectConfig = await configService.loadProjectConfigFrom(targetDir);
+        const resolvedProject = project ?? projectConfig?.config.project;
         if (!resolvedProject) {
-          return errorResult("No project provided and none configured in pkgseer.yml. " + "Either pass project parameter or add project to your config.");
+          return errorResult(`No project specified and no pkgseer.yml found. To fix:
+` + `  1. Pass project_directory: '/path/to/project' (folder containing pkgseer.yml)
+` + `  2. Pass project: 'project-name' directly if you know the project name
+` + "  3. Run 'pkgseer project init' to create pkgseer.yml in your project");
         }
         const normalizedTerms = terms?.map((term) => term.trim()).filter((term) => term.length > 0) ?? [];
         if (normalizedTerms.length === 0) {
@@ -4296,8 +4680,13 @@ var TOOL_FACTORIES = {
   compare_packages: ({ pkgseerService }) => createComparePackagesTool(pkgseerService),
   list_package_docs: ({ pkgseerService }) => createListPackageDocsTool(pkgseerService),
   fetch_package_doc: ({ pkgseerService }) => createFetchPackageDocTool(pkgseerService),
-  search_package_docs: ({ pkgseerService }) => createSearchPackageDocsTool(pkgseerService),
-  search_project_docs: ({ pkgseerService, config }) => createSearchProjectDocsTool({ pkgseerService, config })
+  search: ({ pkgseerService }) => createSearchTool(pkgseerService),
+  fetch_code_context: ({ pkgseerService }) => createFetchCodeContextTool(pkgseerService),
+  search_project_docs: ({ pkgseerService, configService, defaultProjectDir }) => createSearchProjectDocsTool({
+    pkgseerService,
+    configService,
+    defaultProjectDir
+  })
 };
 var PUBLIC_READ_TOOLS = [
   "package_summary",
@@ -4307,21 +4696,29 @@ var PUBLIC_READ_TOOLS = [
   "compare_packages",
   "list_package_docs",
   "fetch_package_doc",
-  "search_package_docs"
+  "search",
+  "fetch_code_context"
 ];
 var PROJECT_READ_TOOLS = ["search_project_docs"];
 var ALL_TOOLS = [...PUBLIC_READ_TOOLS, ...PROJECT_READ_TOOLS];
 function createMcpServer(deps) {
-  const { pkgseerService, config } = deps;
+  const { pkgseerService, configService, config, fileSystemService } = deps;
   const server = new McpServer({
     name: "pkgseer",
     version: "0.1.0"
   });
+  const defaultProjectDir = fileSystemService.getCwd();
   const enabledToolNames = config.enabled_tools ?? ALL_TOOLS;
   const toolsToRegister = enabledToolNames.filter((name) => ALL_TOOLS.includes(name));
+  const factoryDeps = {
+    pkgseerService,
+    configService,
+    config,
+    defaultProjectDir
+  };
   for (const toolName of toolsToRegister) {
     const factory = TOOL_FACTORIES[toolName];
-    const tool = factory({ pkgseerService, config });
+    const tool = factory(factoryDeps);
     server.registerTool(tool.name, { description: tool.description, inputSchema: tool.schema }, tool.handler);
   }
   return server;