githits 0.4.3 → 0.4.4

package/dist/cli.js

@@ -32,6 +32,7 @@ import {
   PackageIntelligenceValidationError,
   PackageIntelligenceVersionNotFoundError,
   PromptServiceImpl,
+  clearAutoLoginAuthSessionMetadata,
   createAuthCommandDependencies,
   createAuthStatusDependencies,
   createContainer,
@@ -42,6 +43,7 @@ import {
   formatUpdateNotice,
   getCodeNavigationUrl,
   isTelemetryEnabled,
+  loadAutoLoginAuthSessionMetadata,
   refreshExpiredToken,
   setClientMode,
   setMcpClientVersionProvider,
@@ -49,11 +51,11 @@ import {
   shouldRunUpdateCheck,
   startTelemetrySpan,
   withTelemetrySpan
-} from "./shared/chunk-15argn2z.js";
+} from "./shared/chunk-tfqxat16.js";
 import {
   __require,
   version
-} from "./shared/chunk-q6d3ttgn.js";
+} from "./shared/chunk-96tjsv6y.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -914,7 +916,7 @@ var GREP_REPO_PATTERN_NOTE = "Text grep over indexed source files. `literal` (de
 function buildGrepRepoParams(input) {
   const pattern = input.pattern ?? "";
   if (pattern.length === 0 || pattern.trim().length === 0) {
-    throw new InvalidPackageSpecError("`pattern` is required — pass the text to search for.");
+    throw new InvalidPackageSpecError("`pattern` is required — pass the text to search for. If you are trying to list files or count files in scope, use `code_files` instead.");
   }
   if (Buffer.byteLength(pattern, "utf8") > PATTERN_MAX) {
     throw new InvalidPackageSpecError(`\`pattern\` must be ≤ ${PATTERN_MAX} UTF-8 bytes.`);
@@ -1057,7 +1059,13 @@ function normalizeWaitTimeoutMs(value) {
   }
   return value;
 }
+// src/shared/shell-quote.ts
+function shellQuote(value) {
+  return `'${value.replaceAll("'", `'"'"'`)}'`;
+}
+
 // src/shared/grep-repo-response.ts
+var UTF8_ENCODER = new TextEncoder;
 function buildGrepRepoSuccessPayload(result, options) {
   const envelope = {
     pattern: options.pattern,
@@ -1369,7 +1377,7 @@ function renderVerboseLine(line, gutterWidth, useColors) {
     if (line.symbolHint) {
       const hintIndent = " ".repeat(2 + gutterWidth + 2);
       return `${matchRow}
-${hintIndent}${dim(`↳ in: ${line.symbolHint}`, useColors)}`;
+${hintIndent}${dim(`in: ${line.symbolHint}`, useColors)}`;
     }
     return matchRow;
   }
@@ -1388,8 +1396,9 @@ function formatSymbolHint(symbol) {
     parts.push("public");
   if (symbol.arity !== undefined)
     parts.push(`arity=${symbol.arity}`);
-  if (symbol.callerCount !== undefined)
+  if (symbol.callerCount !== undefined) {
     parts.push(`callers=${symbol.callerCount}`);
+  }
   if (symbol.startLine !== undefined && symbol.endLine !== undefined) {
     parts.push(`L${symbol.startLine}-${symbol.endLine}`);
   }
@@ -1426,9 +1435,6 @@ function shouldSuggestNarrowingScope(envelope) {
 function formatCount(count, singular, plural = `${singular}s`) {
   return `${count} ${count === 1 ? singular : plural}`;
 }
-function shellQuote(value) {
-  return `'${value.replaceAll("'", `'"'"'`)}'`;
-}
 function padLeft(text, width) {
   return text.length >= width ? text : `${" ".repeat(width - text.length)}${text}`;
 }
@@ -1449,7 +1455,21 @@ function mergeRanges(existing, incoming) {
   return merged;
 }
 function clampCharacterOffset(text, offset) {
-  return Math.max(0, Math.min(text.length, offset));
+  if (offset <= 0)
+    return 0;
+  let byteOffset = 0;
+  for (let index = 0;index < text.length; ) {
+    const codePoint = text.codePointAt(index);
+    if (codePoint === undefined)
+      break;
+    const char = String.fromCodePoint(codePoint);
+    const nextByteOffset = byteOffset + UTF8_ENCODER.encode(char).length;
+    if (nextByteOffset > offset)
+      return index;
+    byteOffset = nextByteOffset;
+    index += char.length;
+  }
+  return text.length;
 }
 // src/shared/grep-repo-text.ts
 var SEP = " | ";
@@ -1509,33 +1529,8 @@ function buildHeader(envelope) {
     flags.push("case-sensitive");
   if (flags.length > 0)
     parts.push(flags.join(","));
-  const filterEcho = buildFilterEcho(envelope);
-  if (filterEcho)
-    parts.push(filterEcho);
   return parts.join(SEP);
 }
-function buildFilterEcho(envelope) {
-  const filter = envelope.filter;
-  if (!filter)
-    return "";
-  const parts = [];
-  if (filter.path)
-    parts.push(`path=${quote2(filter.path)}`);
-  if (filter.pathPrefix)
-    parts.push(`path_prefix=${quote2(filter.pathPrefix)}`);
-  if (filter.globs?.length)
-    parts.push(`globs=${filter.globs.join(",")}`);
-  if (filter.extensions?.length) {
-    parts.push(`exts=${filter.extensions.join(",")}`);
-  }
-  if (typeof filter.maxMatches === "number") {
-    parts.push(`max_matches=${filter.maxMatches}`);
-  }
-  if (typeof filter.maxMatchesPerFile === "number") {
-    parts.push(`max_matches_per_file=${filter.maxMatchesPerFile}`);
-  }
-  return parts.join(" ");
-}
 function buildTrailer(envelope) {
   const lines = [];
   if (envelope.truncatedReason) {
@@ -1701,7 +1696,7 @@ function buildHeader2(envelope) {
   ];
   if (identity)
     parts.push(identity);
-  const filter = buildFilterEcho2(envelope);
+  const filter = buildFilterEcho(envelope);
   if (filter)
     parts.push(filter);
   return parts.join(SEP2);
@@ -1716,7 +1711,7 @@ function buildIdentity(envelope) {
   }
   return "";
 }
-function buildFilterEcho2(envelope) {
+function buildFilterEcho(envelope) {
   const parts = [];
   if (envelope.filter?.path) {
     parts.push(`path=${quote3(envelope.filter.path)}`);
@@ -1910,6 +1905,8 @@ function formatListPackageDocsTerminal(envelope, options) {
       lines.push(...meta);
     lines.push("");
   }
+  lines.push(dim("Read a page: githits docs read '<pageId>'", options.useColors));
+  lines.push("");
   if (envelope.nextCursor) {
     lines.push(dim(`Next cursor: ${envelope.nextCursor}`, options.useColors));
   }
@@ -1923,7 +1920,7 @@ function formatListPackageDocsTerminal(envelope, options) {
 }
 function buildSummaryHeader(envelope, useColors) {
   const target = envelope.registry && envelope.name ? `${envelope.registry}:${envelope.name}${envelope.version ? `@${envelope.version}` : ""}` : "package docs";
-  const summary = `${target} · ${envelope.pages.length} page${envelope.pages.length === 1 ? "" : "s"}`;
+  const summary = `${target} | ${envelope.pages.length} page${envelope.pages.length === 1 ? "" : "s"}`;
   const suffix = envelope.total !== undefined ? ` of ${envelope.total}` : "";
   return `${colorize(summary, "bold", useColors)}${dim(suffix, useColors)}`;
 }
@@ -2415,7 +2412,7 @@ function formatPackageDependenciesTerminal(report, options = {}) {
     const issues = formatConflictsAndCycles(payload, verbose, useColors);
     if (issues)
       blocks.push(issues);
-  } else {
+  } else if (!showGroups) {
     blocks.push(formatDirectDepsList(payload, verbose, useColors));
   }
   if (showGroups) {
@@ -2429,7 +2426,7 @@ function formatPackageDependenciesTerminal(report, options = {}) {
 function formatHeaderBlock(payload, useColors, showGroups, options) {
   const name = colorize(payload.name, "bold", useColors);
   const lines = [
-    `${name} @ ${payload.version} · ${payload.registry}`
+    `${name} @ ${payload.version} | ${payload.registry}`
   ];
   if (payload.requestedVersion) {
     lines.push(dim(`(requested ${payload.requestedVersion})`, useColors));
@@ -2469,13 +2466,13 @@ function formatSummaryRow(payload, useColors, showGroups, options) {
       countParts.push(colorize(`${cycleCount} ${noun}`, "red", useColors));
     }
   }
-  const countLine = countParts.join(" · ");
+  const countLine = countParts.join(" | ");
   if (showGroups)
     return countLine;
   const hidden = collectHiddenGroupNames(payload);
   if (hidden.length === 0)
     return countLine;
-  const hiddenLine = dim(`Hidden groups: ${hidden.join(", ")} — ${options.hiddenGroupsHint ?? "use --lifecycle all."}`, useColors);
+  const hiddenLine = dim(`Hidden groups: ${hidden.join(", ")} - ${options.hiddenGroupsHint ?? "use --lifecycle all."}`, useColors);
   return `${countLine}
 ${hiddenLine}`;
 }
@@ -2490,18 +2487,21 @@ function formatDirectDepsList(payload, verbose, useColors) {
   if (!runtime || runtime.count === 0)
     return "";
   const sorted = sortAlphabetically(runtime.items, (i) => i.name);
+  const lines = ["Runtime dependencies:", ""];
   if (!verbose) {
-    return sorted.map((item) => `  ${formatDepLabel(item)}`).join(`
+    lines.push(...sorted.map((item) => `  ${formatDepLabel(item)}`));
+    return lines.join(`
 `);
   }
   const rootLabel = `${payload.name}@${payload.version}`;
-  return sorted.map((item) => {
+  lines.push(...sorted.map((item) => {
     const head = `  ${formatDepLabel(item)}`;
     const constraintLabel = item.constraint ?? "*";
     const line = dim(`    - ${constraintLabel} required by ${rootLabel}`, useColors);
     return `${head}
 ${line}`;
-  }).join(`
+  }));
+  return lines.join(`
 `);
 }
 function formatDepLabel(item) {
@@ -2516,11 +2516,13 @@ function formatTransitiveDepsList(payload, verbose, useColors) {
   if (packages.length === 0)
     return "";
   const sorted = [...packages].sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
+  const lines = ["Transitive packages:", ""];
   if (!verbose) {
-    return sorted.map((pkg) => `  ${formatPackageLabel(pkg)}`).join(`
+    lines.push(...sorted.map((pkg) => `  ${formatPackageLabel(pkg)}`));
+    return lines.join(`
 `);
   }
-  return sorted.map((pkg) => {
+  lines.push(...sorted.map((pkg) => {
     const head = `  ${formatPackageLabel(pkg)}`;
     const importers = pkg.importers ?? [];
     if (importers.length === 0)
@@ -2528,7 +2530,8 @@ function formatTransitiveDepsList(payload, verbose, useColors) {
     const bullets = formatImporterBullets(importers, useColors);
     return `${head}
 ${bullets}`;
-  }).join(`
+  }));
+  return lines.join(`
 `);
 }
 function formatPackageLabel(pkg) {
@@ -2583,7 +2586,7 @@ function formatConflictsAndCycles(payload, verbose, useColors) {
       lines.push("");
     lines.push(colorize(`Circular dependencies (${cycles.length}):`, "red", useColors));
     for (const c of cycles)
-      lines.push(`  ${c.cycle.join(" → ")}`);
+      lines.push(`  ${c.cycle.join(" -> ")}`);
   }
   return lines.join(`
 `);
@@ -2598,6 +2601,8 @@ function formatGroupsBlock(payload, verbose, useColors) {
   }
   const summary = summariseGroupsByLifecycle(groups.items);
   const groupNoun = groups.items.length === 1 ? "group" : "groups";
+  lines.push("Dependency groups:");
+  lines.push("");
   lines.push(colorize(`${groups.items.length} ${groupNoun} (${summary}):`, "bold", useColors));
   lines.push("");
   if (verbose && groups.environmentMarkers && groups.environmentMarkers.length > 0) {
@@ -2622,9 +2627,7 @@ function formatGroupsBlock(payload, verbose, useColors) {
     } else {
       const nameWidth = Math.max(...deps.map((d) => d.name.length));
       for (const dep of deps) {
-        const name = dep.name.padEnd(nameWidth);
-        const constraint = dep.constraint ?? "";
-        lines.push(`    ${name}  ${constraint}`.trimEnd());
+        lines.push(`    ${formatGroupDependencyRow(dep, group, payload, nameWidth)}`);
       }
     }
     lines.push("");
@@ -2632,6 +2635,20 @@ function formatGroupsBlock(payload, verbose, useColors) {
   return lines.join(`
 `).trimEnd();
 }
+function formatGroupDependencyRow(dep, group, payload, nameWidth) {
+  const constraint = dep.constraint ?? "";
+  if (group.lifecycle !== "runtime") {
+    const name = dep.name.padEnd(nameWidth);
+    return `${name}  ${constraint}`.trimEnd();
+  }
+  const resolvedVersion = payload.runtime?.items.find((item) => item.name === dep.name)?.version;
+  if (!resolvedVersion) {
+    const name = dep.name.padEnd(nameWidth);
+    return `${name}  ${constraint}`.trimEnd();
+  }
+  const versionedName = `${dep.name}@${resolvedVersion}`.padEnd(nameWidth);
+  return `${versionedName}  ${constraint}`.trimEnd();
+}
 function formatEnvironmentMarker(marker) {
   if (marker.type && marker.value)
     return `${marker.type}: ${marker.value}`;
@@ -3272,7 +3289,7 @@ function buildPackageVulnerabilitiesParams(input) {
     throw new InvalidPackageSpecError(`Invalid version '${trimmedVersion}'. Use the canonical package version without a leading 'v' (for example '4.18.0', not 'v4.18.0').`);
   }
   const advisoryScope = resolveAdvisoryScope(input.advisoryScope);
-  const filterWithScope = buildFilterEcho3(severityLabel2, input.includeWithdrawn, advisoryScope);
+  const filterWithScope = buildFilterEcho2(severityLabel2, input.includeWithdrawn, advisoryScope);
   return {
     params: {
       registry,
@@ -3297,7 +3314,7 @@ function resolveMinSeverityLabel(raw) {
   }
   return lower;
 }
-function buildFilterEcho3(minSeverity, includeWithdrawn, advisoryScope) {
+function buildFilterEcho2(minSeverity, includeWithdrawn, advisoryScope) {
   const filter = {};
   if (minSeverity !== undefined)
     filter.minSeverity = minSeverity;
@@ -4094,16 +4111,144 @@ function requirePositiveInteger(raw, label) {
   }
   return parsed;
 }
+// src/shared/read-file-response.ts
+function buildReadFileSuccessPayload(result, options) {
+  const envelope = {
+    path: result.filePath ?? options.requestedFilePath
+  };
+  if (options.registry)
+    envelope.registry = options.registry;
+  if (options.name)
+    envelope.name = options.name;
+  if (options.repoUrl)
+    envelope.repoUrl = options.repoUrl;
+  if (options.gitRef)
+    envelope.gitRef = options.gitRef;
+  if (result.language != null)
+    envelope.language = result.language;
+  if (result.totalLines != null)
+    envelope.totalLines = result.totalLines;
+  if (result.startLine != null)
+    envelope.startLine = result.startLine;
+  if (result.endLine != null)
+    envelope.endLine = result.endLine;
+  if (result.isBinary) {
+    envelope.isBinary = true;
+  } else if (result.content != null) {
+    envelope.content = result.content;
+  }
+  return envelope;
+}
+function formatReadFileTerminal(envelope, options) {
+  const verbose = options.verbose ?? false;
+  if (envelope.isBinary) {
+    return formatBinary(envelope, options, verbose);
+  }
+  if (envelope.content == null) {
+    return formatNoContent(envelope, options, verbose);
+  }
+  if (!verbose) {
+    return envelope.content;
+  }
+  return formatVerboseBody(envelope, options);
+}
+function formatBinary(envelope, options, verbose) {
+  const sentinel = dim("Binary file — cannot display as text.", options.useColors);
+  if (verbose) {
+    return `${buildHeader4(envelope, options)}
+
+${sentinel}
+`;
+  }
+  return `${sentinel}
+`;
+}
+function formatNoContent(envelope, options, verbose) {
+  const sentinel = dim("(no content returned)", options.useColors);
+  if (verbose) {
+    return `${buildHeader4(envelope, options)}
+
+${sentinel}
+`;
+  }
+  return `${sentinel}
+`;
+}
+function formatVerboseBody(envelope, options) {
+  const lines = [];
+  lines.push(buildHeader4(envelope, options));
+  lines.push("");
+  const bodyLines = splitReadFileContentLines(envelope);
+  const startLine = envelope.startLine ?? 1;
+  const endLine = startLine + bodyLines.length - 1;
+  const gutterWidth = String(endLine).length;
+  for (let i = 0;i < bodyLines.length; i++) {
+    const lineNumber = startLine + i;
+    const gutter = dim(String(lineNumber).padStart(gutterWidth, " "), options.useColors);
+    lines.push(`${gutter}  ${bodyLines[i]}`);
+  }
+  if (envelope.hint) {
+    lines.push("");
+    lines.push(dim(envelope.hint, options.useColors));
+  }
+  lines.push("");
+  return lines.join(`
+`);
+}
+function splitReadFileContentLines(envelope) {
+  if (!envelope.content)
+    return [];
+  const bodyLines = envelope.content.split(`
+`);
+  const expectedCount = expectedLineCount(envelope);
+  if (expectedCount === undefined) {
+    if (bodyLines[bodyLines.length - 1] === "")
+      bodyLines.pop();
+    return bodyLines;
+  }
+  while (bodyLines.length > 0 && bodyLines[bodyLines.length - 1] === "" && bodyLines.length > expectedCount) {
+    bodyLines.pop();
+  }
+  return bodyLines;
+}
+function expectedLineCount(envelope) {
+  if (envelope.startLine === undefined || envelope.endLine === undefined) {
+    return;
+  }
+  if (envelope.endLine < envelope.startLine)
+    return;
+  return envelope.endLine - envelope.startLine + 1;
+}
+function buildHeader4(envelope, options) {
+  const parts = [envelope.path];
+  if (envelope.language)
+    parts.push(envelope.language);
+  const rangeLabel = buildRangeLabel(envelope);
+  if (rangeLabel)
+    parts.push(rangeLabel);
+  return colorize(parts.join(" · "), "bold", options.useColors);
+}
+function buildRangeLabel(envelope) {
+  const { startLine, endLine, totalLines } = envelope;
+  if (startLine != null && endLine != null) {
+    return totalLines != null ? `lines ${startLine}-${endLine} of ${totalLines}` : `lines ${startLine}-${endLine}`;
+  }
+  if (totalLines != null) {
+    return `${totalLines} lines`;
+  }
+  return;
+}
+
 // src/shared/read-file-text.ts
 var SEP4 = " | ";
 function renderReadFileText(envelope) {
   const lines = [];
-  lines.push(buildHeader4(envelope));
+  lines.push(buildHeader5(envelope));
   lines.push("");
   if (envelope.isBinary) {
     lines.push("Binary file - cannot display as text.");
   } else if (envelope.content) {
-    appendNumberedContent(lines, envelope.content, envelope.startLine ?? 1);
+    appendNumberedContent(lines, envelope.content, envelope.startLine ?? 1, envelope.endLine);
   } else {
     lines.push("(no content returned)");
   }
@@ -4114,7 +4259,7 @@ function renderReadFileText(envelope) {
   return lines.join(`
 `);
 }
-function buildHeader4(envelope) {
+function buildHeader5(envelope) {
   const parts = [`code_read${SEP4}${envelope.path}`];
   if (envelope.language)
     parts.push(envelope.language);
@@ -4131,14 +4276,10 @@ function buildRange(envelope) {
     return `${envelope.totalLines} lines`;
   return;
 }
-function appendNumberedContent(lines, content, startLine) {
-  const bodyLines = content.split(`
-`);
-  if (bodyLines.length > 0 && bodyLines[bodyLines.length - 1] === "") {
-    bodyLines.pop();
-  }
-  const endLine = startLine + bodyLines.length - 1;
-  const width = String(endLine).length;
+function appendNumberedContent(lines, content, startLine, endLine) {
+  const bodyLines = splitReadFileContentLines({ content, startLine, endLine });
+  const renderedEndLine = startLine + bodyLines.length - 1;
+  const width = String(renderedEndLine).length;
   for (let i = 0;i < bodyLines.length; i += 1) {
     lines.push(`${String(startLine + i).padStart(width, " ")}  ${bodyLines[i]}`);
   }
@@ -4234,7 +4375,7 @@ function formatReadPackageDocTerminal(envelope, options) {
     return envelope.content ?? "";
   }
   const lines = [];
-  lines.push(buildHeader5(envelope, options.useColors));
+  lines.push(buildHeader6(envelope, options.useColors));
   lines.push(`pageId: ${envelope.pageId}`);
   if (envelope.sourceUrl)
     lines.push(`source: ${envelope.sourceUrl}`);
@@ -4254,7 +4395,7 @@ function formatReadPackageDocTerminal(envelope, options) {
 `)}
 `;
 }
-function buildHeader5(envelope, useColors) {
+function buildHeader6(envelope, useColors) {
   const badge = envelope.sourceKind === "repo" ? "[repo]" : "[crawled]";
   const title = envelope.title ?? envelope.pageId;
   const prefix = envelope.registry && envelope.name ? `${envelope.registry}:${envelope.name}${envelope.version ? `@${envelope.version}` : ""}` : "documentation";
@@ -4264,7 +4405,7 @@ function buildHeader5(envelope, useColors) {
 var SEP5 = " | ";
 function renderReadPackageDocText(envelope) {
   const lines = [];
-  lines.push(buildHeader6(envelope));
+  lines.push(buildHeader7(envelope));
   if (envelope.sourceUrl)
     lines.push(`source: ${envelope.sourceUrl}`);
   if (envelope.filePath) {
@@ -4281,7 +4422,7 @@ function renderReadPackageDocText(envelope) {
   return lines.join(`
 `);
 }
-function buildHeader6(envelope) {
+function buildHeader7(envelope) {
   const parts = [`docs_read${SEP5}${envelope.pageId}`];
   if (envelope.title)
     parts.push(envelope.title);
@@ -4601,6 +4742,7 @@ var AUTO_LOGIN_ELIGIBLE_COMMANDS = new Set([
   "pkg deps",
   "pkg changelog"
 ]);
+var AUTH_METADATA_TRUST_WINDOW_MS = 10 * 60 * 1000;
 function getCommandPath(command) {
   const names = [];
   let current = command;
@@ -4633,10 +4775,15 @@ async function maybeAutoLoginBeforeCommand(command, deps) {
   })) {
     return { status: "skipped" };
   }
+  const metadata = await deps.loadAuthSessionMetadata?.();
+  if (metadata && isUnexpiredAuthSessionMetadata(metadata, new Date)) {
+    return { status: "already-authenticated" };
+  }
   const container = await deps.createContainer();
   if (container.hasValidToken) {
     return { status: "already-authenticated" };
   }
+  await deps.clearAuthSessionMetadata?.();
   const result = await deps.loginFlow({}, container);
   switch (result.status) {
     case "success":
@@ -4647,6 +4794,20 @@ async function maybeAutoLoginBeforeCommand(command, deps) {
       return { status: "failed", message: result.message };
   }
 }
+function isUnexpiredAuthSessionMetadata(metadata, now) {
+  const updatedAtMs = Date.parse(metadata.updatedAt);
+  if (Number.isNaN(updatedAtMs))
+    return false;
+  if (now.getTime() - updatedAtMs > AUTH_METADATA_TRUST_WINDOW_MS) {
+    return false;
+  }
+  if (metadata.expiresAt === null)
+    return true;
+  const expiresAtMs = Date.parse(metadata.expiresAt);
+  if (Number.isNaN(expiresAtMs))
+    return false;
+  return now.getTime() < expiresAtMs;
+}
 
 // src/shared/root-cli-pre-action.ts
 function createRootCliPreAction(deps) {
@@ -5071,7 +5232,7 @@ function compactProgress(progress) {
     payload.requestedTargets = progress.requestedTargets;
   }
   if (progress.filters)
-    payload.filters = buildFilterEcho4(progress.filters);
+    payload.filters = buildFilterEcho3(progress.filters);
   if (typeof progress.limit === "number")
     payload.limit = progress.limit;
   if (typeof progress.offset === "number")
@@ -5118,7 +5279,7 @@ function compactProgressTarget(target) {
     payload.requestedRefKind = target.requestedRefKind;
   return Object.keys(payload).length > 0 ? payload : undefined;
 }
-function buildFilterEcho4(filters) {
+function buildFilterEcho3(filters) {
   const echo = {};
   if (filters.kind)
     echo.kind = filters.kind.toLowerCase();
@@ -5293,7 +5454,7 @@ var SUMMARY_WRAP_WIDTH = 76;
 var SEP6 = " | ";
 function renderUnifiedSearchSuccess(payload) {
   const lines = [];
-  lines.push(buildHeader7(payload));
+  lines.push(buildHeader8(payload));
   lines.push("");
   if (payload.results.length === 0) {
     lines.push(payload.completed ? "No hits." : "No hits yet - indexing.");
@@ -5324,7 +5485,7 @@ function renderUnifiedSearchError(payload) {
   return lines.join(`
 `);
 }
-function buildHeader7(payload) {
+function buildHeader8(payload) {
   const count = payload.results.length;
   const status = payload.completed ? `${count} hit${count === 1 ? "" : "s"}` : `${count} partial`;
   const parts = [`search${SEP6}${status}`];
@@ -5342,7 +5503,7 @@ function appendUnifiedSearchHits(lines, hits) {
   });
 }
 function appendHit(lines, index, hit) {
-  const headerParts = [hit.target, shortType(hit.type)];
+  const headerParts = [formatHitPrimary(hit), shortType(hit.type)];
   lines.push(`[${index}] ${headerParts.join("  ")}`);
   const locator = buildLocatorLine(hit);
   if (locator)
@@ -5356,6 +5517,26 @@ function appendHit(lines, index, hit) {
     }
   }
 }
+function formatHitPrimary(hit) {
+  const loc = hit.locator;
+  if (hit.type === "documentation_page" && loc.pageId) {
+    const target = formatDocsPageTarget(loc, hit.target);
+    return target ? `${loc.pageId} ${target}` : loc.pageId;
+  }
+  if (hit.type === "repository_doc" && loc.filePath) {
+    return `${hit.target} ${loc.filePath}${formatLineRange(loc.startLine, loc.endLine)}`;
+  }
+  return hit.target;
+}
+function formatDocsPageTarget(locator, fallbackTarget) {
+  return locator.registry && locator.packageName ? `${locator.registry}:${locator.packageName}` : stripVersionFromTarget(fallbackTarget);
+}
+function stripVersionFromTarget(value) {
+  if (!value)
+    return "";
+  const atIndex = value.lastIndexOf("@");
+  return atIndex > 0 ? value.slice(0, atIndex) : value;
+}
 function shortType(type) {
   switch (type) {
     case "repository_code":
@@ -5524,7 +5705,7 @@ function wrapText2(text, width) {
 var SEP7 = " | ";
 function renderUnifiedSearchStatusText(payload) {
   const lines = [];
-  lines.push(buildHeader8(payload));
+  lines.push(buildHeader9(payload));
   if (!payload.completed && payload.progress) {
     lines.push(formatProgress(payload.progress));
     if (payload.progress.targets?.length) {
@@ -5548,7 +5729,7 @@ function renderUnifiedSearchStatusText(payload) {
   return lines.join(`
 `);
 }
-function buildHeader8(payload) {
+function buildHeader9(payload) {
   const state = payload.completed ? "complete" : "indexing";
   const parts = [`search_status${SEP7}${state}`];
   if (payload.searchRef)
@@ -6121,8 +6302,8 @@ function looksLikeMissingNavpackMessage(message) {
   const lower = message.toLowerCase();
   return lower.includes("has no navpack for this ref") || lower.includes("navpack was pruned") || lower.includes("indexedrepository row still claims current state");
 }
-function handleCodeNavCommandError(error2, json, terminalRenderer, exitCode = 1) {
-  const mapped = mapCodeNavigationError(error2);
+function handleCodeNavCommandError(error2, json, terminalRenderer, exitCode = 1, mapMappedError = (mapped) => mapped) {
+  const mapped = mapMappedError(mapCodeNavigationError(error2));
   if (json) {
     console.error(JSON.stringify({
       error: mapped.message,
@@ -6393,7 +6574,7 @@ grep run. --symbol-field hydrates enclosing symbol metadata (appears under each
 match in --verbose output; full payload in --json).`;
 function registerCodeGrepCommand(pkgCommand) {
   return pkgCommand.command("grep").summary("Deterministic text grep over indexed dependency source").description(PKG_GREP_DESCRIPTION).argument("[spec-or-pattern]", "Spec mode: package spec (e.g. npm:express). Repo mode (with --repo-url): the pattern.").argument("[pattern-or-prefix]", "Spec mode: the pattern. Repo mode: optional path-prefix.").argument("[path-prefix]", "Spec mode only: optional path-prefix. Ignored with --repo-url.").option("--repo-url <url>", "Repository URL addressing (requires --git-ref)").option("--git-ref <ref>", "Tag, commit, branch, or HEAD. Required with --repo-url.").option("--path <path>", "Exact file path to grep").option("--glob <glob>", "Glob scope (repeatable)", collectRepeatable2, []).option("--ext <ext>", "Extension filter without leading dot (repeatable)", collectRepeatable2, []).option("--regex", "Interpret the pattern as RE2 regex").option("--case-sensitive", "Enable ASCII case-sensitive matching").option("-C, --context <n>", "Context lines before and after each match (0-10)").option("-B, --before-context <n>", "Context lines before each match (0-10)").option("-A, --after-context <n>", "Context lines after each match (0-10)").option("--exclude-docs", "Skip files classified as documentation").option("--exclude-tests", "Skip files classified as tests").option("--limit <n>", "Max matches to return on this page (1-1000, default 50)").option("--per-file-limit <n>", "Cap matches per file within this page (0-1000, 0 = unlimited)").option("--cursor <cursor>", "Opaque nextCursor from a previous grep result").option("--symbol-field <field>", `Repeatable; surfaces in --json and under each --verbose match. ${GREP_REPO_SYMBOL_FIELDS_NOTE}`, collectRepeatable2, []).option("--wait <ms>", `Indexing wait timeout (0-${MAX_WAIT_TIMEOUT_MS}, default ${DEFAULT_WAIT_TIMEOUT_MS})`).option("-v, --verbose", "Render grouped output with file headers").option("--json", "Emit the JSON envelope").action(async (arg1, arg2, arg3, options) => {
-    const { createContainer: createContainer2 } = await import("./shared/chunk-kmka6wpx.js");
+    const { createContainer: createContainer2 } = await import("./shared/chunk-k35egwwf.js");
     const deps = await createContainer2();
     await pkgGrepAction(arg1, arg2, arg3, options, {
       codeNavigationService: deps.codeNavigationService,
@@ -6404,6 +6585,36 @@ function registerCodeGrepCommand(pkgCommand) {
   });
 }
 
+// src/shared/read-file-error.ts
+function withReadFileRecovery(mapped, requestedPath) {
+  if (mapped.code !== "FILE_NOT_FOUND" && mapped.code !== "NOT_FOUND") {
+    return mapped;
+  }
+  return {
+    ...mapped,
+    details: {
+      ...mapped.details,
+      action: buildReadFileNotFoundAction(requestedPath)
+    }
+  };
+}
+function buildReadFileNotFoundAction(requestedPath) {
+  const prefix = buildPathPrefixSuggestion(requestedPath);
+  return "`code_read` reads files only, not directories. " + `Use \`code_files\` with \`path_prefix: ${JSON.stringify(prefix)}\` ` + "to list candidate files, then pass an emitted `path` back to `code_read`.";
+}
+function buildPathPrefixSuggestion(requestedPath) {
+  const trimmed = requestedPath.trim();
+  if (trimmed === "")
+    return "";
+  if (trimmed.endsWith("/"))
+    return trimmed;
+  const slash = trimmed.lastIndexOf("/");
+  const basename = slash === -1 ? trimmed : trimmed.slice(slash + 1);
+  if (!basename.includes("."))
+    return `${trimmed}/`;
+  return slash === -1 ? "" : trimmed.slice(0, slash + 1);
+}
+
 // src/shared/read-file-request.ts
 var WAIT_MIN3 = 0;
 var WAIT_MAX2 = 60000;
@@ -6412,6 +6623,9 @@ function buildReadFileParams(input) {
   if (!filePath) {
     throw new InvalidPackageSpecError("`file_path` is required — pass the path to the file within the package or repo.");
   }
+  if (filePath.endsWith("/")) {
+    throw new InvalidPackageSpecError(`\`file_path\` must be an exact file path, not a directory prefix. Use \`code_files\` with \`path_prefix: ${JSON.stringify(filePath)}\` to list files, then pass an emitted \`path\` to \`code_read\`.`);
+  }
   const startLine = normaliseLine(input.startLine, "start_line");
   const endLine = normaliseLine(input.endLine, "end_line");
   if (startLine !== undefined && endLine !== undefined && startLine > endLine) {
@@ -6445,164 +6659,57 @@ function normaliseWaitTimeoutMs2(raw) {
   return raw;
 }
 
-// src/shared/read-file-response.ts
-function buildReadFileSuccessPayload(result, options) {
-  const envelope = {
-    path: result.filePath ?? options.requestedFilePath
-  };
-  if (options.registry)
-    envelope.registry = options.registry;
-  if (options.name)
-    envelope.name = options.name;
-  if (options.repoUrl)
-    envelope.repoUrl = options.repoUrl;
-  if (options.gitRef)
-    envelope.gitRef = options.gitRef;
-  if (result.language != null)
-    envelope.language = result.language;
-  if (result.totalLines != null)
-    envelope.totalLines = result.totalLines;
-  if (result.startLine != null)
-    envelope.startLine = result.startLine;
-  if (result.endLine != null)
-    envelope.endLine = result.endLine;
-  if (result.isBinary) {
-    envelope.isBinary = true;
-  } else if (result.content != null) {
-    envelope.content = result.content;
+// src/commands/code/read.ts
+async function pkgReadAction(firstArg, secondArg, options, deps) {
+  requireAuth(deps);
+  let requestedFilePath = "";
+  try {
+    if (!deps.codeNavigationUrl || !deps.codeNavigationService) {
+      throw new InvalidPackageSpecError("Code navigation is not configured for this environment.");
+    }
+    const hasRepoUrl = Boolean(options.repoUrl);
+    const { spec, path } = resolvePositionals3(firstArg, secondArg, hasRepoUrl);
+    if (!path || path.trim().length === 0) {
+      throw new InvalidPackageSpecError("A <path> argument is required — pass the path to the file within the package or repo.");
+    }
+    const target = resolveCliCodeNavTarget(spec, options);
+    const pathWithRange = parsePathWithOptionalRange(path.trim());
+    requestedFilePath = pathWithRange.filePath;
+    const range = resolveLineRange(options, pathWithRange);
+    const wait = parseIntCliOption(options.wait, "--wait", 0, MAX_WAIT_TIMEOUT_MS);
+    const build = buildReadFileParams({
+      target,
+      filePath: pathWithRange.filePath,
+      startLine: range.startLine,
+      endLine: range.endLine,
+      waitTimeoutMs: wait
+    });
+    const result = await deps.codeNavigationService.readFile(build.params);
+    const payload = buildReadFileSuccessPayload(result, {
+      registry: target.registry ? toPkgseerRegistryLowercase(target.registry) : undefined,
+      name: target.packageName,
+      repoUrl: target.repoUrl,
+      gitRef: target.gitRef,
+      requestedFilePath: build.params.filePath
+    });
+    if (options.json) {
+      console.log(JSON.stringify(payload));
+      return;
+    }
+    process.stdout.write(formatReadFileTerminal(payload, {
+      useColors: shouldUseColors(),
+      verbose: options.verbose ?? false
+    }));
+  } catch (error2) {
+    handleCodeNavCommandError(error2, options.json ?? false, formatFileErrorWithFilesHint, 1, (mapped) => withReadFileRecovery(mapped, requestedFilePath));
   }
-  return envelope;
 }
-function formatReadFileTerminal(envelope, options) {
-  const verbose = options.verbose ?? false;
-  if (envelope.isBinary) {
-    return formatBinary(envelope, options, verbose);
-  }
-  if (envelope.content == null) {
-    return formatNoContent(envelope, options, verbose);
-  }
-  if (!verbose) {
-    return envelope.content;
-  }
-  return formatVerboseBody(envelope, options);
-}
-function formatBinary(envelope, options, verbose) {
-  const sentinel = dim("Binary file — cannot display as text.", options.useColors);
-  if (verbose) {
-    return `${buildHeader9(envelope, options)}
-
-${sentinel}
-`;
-  }
-  return `${sentinel}
-`;
-}
-function formatNoContent(envelope, options, verbose) {
-  const sentinel = dim("(no content returned)", options.useColors);
-  if (verbose) {
-    return `${buildHeader9(envelope, options)}
-
-${sentinel}
-`;
-  }
-  return `${sentinel}
-`;
-}
-function formatVerboseBody(envelope, options) {
-  const lines = [];
-  lines.push(buildHeader9(envelope, options));
-  lines.push("");
-  const content = envelope.content ?? "";
-  const bodyLines = content.split(`
-`);
-  if (bodyLines.length > 0 && bodyLines[bodyLines.length - 1] === "") {
-    bodyLines.pop();
-  }
-  const startLine = envelope.startLine ?? 1;
-  const endLine = startLine + bodyLines.length - 1;
-  const gutterWidth = String(endLine).length;
-  for (let i = 0;i < bodyLines.length; i++) {
-    const lineNumber = startLine + i;
-    const gutter = dim(String(lineNumber).padStart(gutterWidth, " "), options.useColors);
-    lines.push(`${gutter}  ${bodyLines[i]}`);
-  }
-  if (envelope.hint) {
-    lines.push("");
-    lines.push(dim(envelope.hint, options.useColors));
-  }
-  lines.push("");
-  return lines.join(`
-`);
-}
-function buildHeader9(envelope, options) {
-  const parts = [envelope.path];
-  if (envelope.language)
-    parts.push(envelope.language);
-  const rangeLabel = buildRangeLabel(envelope);
-  if (rangeLabel)
-    parts.push(rangeLabel);
-  return colorize(parts.join(" · "), "bold", options.useColors);
-}
-function buildRangeLabel(envelope) {
-  const { startLine, endLine, totalLines } = envelope;
-  if (startLine != null && endLine != null) {
-    return totalLines != null ? `lines ${startLine}-${endLine} of ${totalLines}` : `lines ${startLine}-${endLine}`;
-  }
-  if (totalLines != null) {
-    return `${totalLines} lines`;
-  }
-  return;
-}
-
-// src/commands/code/read.ts
-async function pkgReadAction(firstArg, secondArg, options, deps) {
-  requireAuth(deps);
-  try {
-    if (!deps.codeNavigationUrl || !deps.codeNavigationService) {
-      throw new InvalidPackageSpecError("Code navigation is not configured for this environment.");
-    }
-    const hasRepoUrl = Boolean(options.repoUrl);
-    const { spec, path } = resolvePositionals3(firstArg, secondArg, hasRepoUrl);
-    if (!path || path.trim().length === 0) {
-      throw new InvalidPackageSpecError("A <path> argument is required — pass the path to the file within the package or repo.");
-    }
-    const target = resolveCliCodeNavTarget(spec, options);
-    const pathWithRange = parsePathWithOptionalRange(path.trim());
-    const range = resolveLineRange(options, pathWithRange);
-    const wait = parseIntCliOption(options.wait, "--wait", 0, MAX_WAIT_TIMEOUT_MS);
-    const build = buildReadFileParams({
-      target,
-      filePath: pathWithRange.filePath,
-      startLine: range.startLine,
-      endLine: range.endLine,
-      waitTimeoutMs: wait
-    });
-    const result = await deps.codeNavigationService.readFile(build.params);
-    const payload = buildReadFileSuccessPayload(result, {
-      registry: target.registry ? toPkgseerRegistryLowercase(target.registry) : undefined,
-      name: target.packageName,
-      repoUrl: target.repoUrl,
-      gitRef: target.gitRef,
-      requestedFilePath: build.params.filePath
-    });
-    if (options.json) {
-      console.log(JSON.stringify(payload));
-      return;
-    }
-    process.stdout.write(formatReadFileTerminal(payload, {
-      useColors: shouldUseColors(),
-      verbose: options.verbose ?? false
-    }));
-  } catch (error2) {
-    handleCodeNavCommandError(error2, options.json ?? false, formatFileErrorWithFilesHint);
-  }
-}
-function resolvePositionals3(firstArg, secondArg, hasRepoUrl) {
-  if (hasRepoUrl) {
-    if (secondArg !== undefined) {
-      throw new InvalidPackageSpecError("In --repo-url mode, pass only the <path> positional — the package spec is replaced by --repo-url.");
-    }
-    return { spec: undefined, path: firstArg };
+function resolvePositionals3(firstArg, secondArg, hasRepoUrl) {
+  if (hasRepoUrl) {
+    if (secondArg !== undefined) {
+      throw new InvalidPackageSpecError("In --repo-url mode, pass only the <path> positional — the package spec is replaced by --repo-url.");
+    }
+    return { spec: undefined, path: firstArg };
   }
   return { spec: firstArg, path: secondArg };
 }
@@ -6927,7 +7034,7 @@ function registerExampleCommand(program) {
   });
 }
 async function loadContainer() {
-  const { createContainer: createContainer2 } = await import("./shared/chunk-kmka6wpx.js");
+  const { createContainer: createContainer2 } = await import("./shared/chunk-k35egwwf.js");
   return createContainer2();
 }
 // src/commands/feedback.ts
@@ -7183,6 +7290,39 @@ function mergeServerConfig(existingContent, serversKey, serverName, serverConfig
 `
   };
 }
+function removeServerConfig(existingContent, serversKey, serverName) {
+  const parsedConfig = parseConfigObject(existingContent);
+  if (parsedConfig.format === "invalid") {
+    return {
+      status: "parse_error",
+      error: parsedConfig.error
+    };
+  }
+  const config = parsedConfig.value;
+  const servers = config[serversKey];
+  if (servers === undefined) {
+    return { status: "not_configured" };
+  }
+  if (typeof servers !== "object" || servers === null || Array.isArray(servers)) {
+    return {
+      status: "parse_error",
+      error: `"${serversKey}" is not a JSON object`
+    };
+  }
+  const serversObj = servers;
+  const matchingKeys = getMatchingServerKeys(serversObj, serverName);
+  if (matchingKeys.length === 0) {
+    return { status: "not_configured" };
+  }
+  for (const key of matchingKeys) {
+    delete serversObj[key];
+  }
+  return {
+    status: "removed",
+    content: `${JSON.stringify(config, null, 2)}
+`
+  };
+}
 function formatSetupPreview(config) {
   if (config.method === "cli") {
     return config.commands.map((cmd) => `Will run: ${cmd.command} ${cmd.args.join(" ")}`).join(`
@@ -7193,6 +7333,13 @@ function formatSetupPreview(config) {
 
 ${snippet}`;
 }
+function formatUninstallPreview(config) {
+  if (config.method === "cli") {
+    return config.commands.map((cmd) => `Will run: ${cmd.command} ${cmd.args.join(" ")}`).join(`
+`);
+  }
+  return `Will remove ${config.serverName} from ${config.configPath}`;
+}
 async function isAlreadyConfigured(config, fs) {
   try {
     const content = await fs.readFile(config.configPath);
@@ -7215,16 +7362,48 @@ async function isAlreadyConfigured(config, fs) {
     return false;
   }
 }
+async function getConfigUninstallCheckStatus(config, fs) {
+  try {
+    const content = await fs.readFile(config.configPath);
+    const parsedConfig = parseConfigObject(content);
+    if (parsedConfig.format === "invalid") {
+      return {
+        status: "failed",
+        message: `Cannot parse ${config.configPath}: ${parsedConfig.error}. File left unchanged.`
+      };
+    }
+    const servers = parsedConfig.value[config.serversKey];
+    if (servers === undefined) {
+      return { status: "not_configured" };
+    }
+    if (typeof servers !== "object" || servers === null || Array.isArray(servers)) {
+      return {
+        status: "failed",
+        message: `Cannot parse ${config.configPath}: "${config.serversKey}" is not a JSON object. File left unchanged.`
+      };
+    }
+    const hasEntry = getMatchingServerKeys(servers, config.serverName).length > 0;
+    return { status: hasEntry ? "configured" : "not_configured" };
+  } catch (err) {
+    if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+      return { status: "not_configured" };
+    }
+    return {
+      status: "failed",
+      message: `Cannot read ${config.configPath}: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+}
 async function getCliCheckStatus(check, execService) {
   try {
     const result = await execService.exec(check.command, check.args);
-    if (check.requireExitCodeZero && result.exitCode !== 0) {
-      return "probe_failed";
-    }
     const combined = `${result.stdout} ${result.stderr}`;
     if (check.notConfiguredPattern?.test(combined)) {
       return "not_configured";
     }
+    if (check.requireExitCodeZero && result.exitCode !== 0) {
+      return "probe_failed";
+    }
     if (check.configuredPattern) {
       return check.configuredPattern.test(combined) ? "configured" : "not_configured";
     }
@@ -7242,9 +7421,18 @@ var ALREADY_EXISTS_PATTERNS = [
   /already added/i,
   /extension\s+"githits"\s+is\s+already\s+installed/i
 ];
+var ALREADY_ABSENT_PATTERNS = [
+  /(?:plugin|extension|server|mcp server)\s+["']?githits["']?\s+(?:was\s+)?not\s+found/i,
+  /["']?githits["']?\s+(?:plugin|extension|server)?\s*(?:does\s+not\s+exist|is\s+not\s+installed|not\s+installed)/i,
+  /unknown\s+(?:plugin|extension|server)\s+["']?githits["']?/i,
+  /marketplace\s+["']?githits-plugins["']?\s+(?:was\s+)?not\s+found/i
+];
 function isAlreadyConfiguredOutput(output) {
   return ALREADY_EXISTS_PATTERNS.some((pattern) => pattern.test(output));
 }
+function isAlreadyAbsentOutput(output) {
+  return ALREADY_ABSENT_PATTERNS.some((pattern) => pattern.test(output));
+}
 async function executeCliCommand(cmd, execService) {
   try {
     const result = await execService.exec(cmd.command, cmd.args);
@@ -7276,6 +7464,37 @@ async function executeCliCommand(cmd, execService) {
     };
   }
 }
+async function executeCliUninstallCommand(cmd, execService) {
+  try {
+    const result = await execService.exec(cmd.command, cmd.args);
+    const combined = `${result.stdout} ${result.stderr}`;
+    if (result.exitCode === 0) {
+      return { status: "removed", message: "Removed successfully" };
+    }
+    if (isAlreadyAbsentOutput(combined)) {
+      return {
+        status: "not_configured",
+        message: `GitHits not configured via ${cmd.command}`
+      };
+    }
+    const detail = result.stderr.trim() || result.stdout.trim();
+    return {
+      status: "failed",
+      message: `Command exited with code ${result.exitCode}${detail ? `: ${detail}` : ""}`
+    };
+  } catch (err) {
+    if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+      return {
+        status: "failed",
+        message: `"${cmd.command}" not found on PATH. Install it or remove GitHits manually.`
+      };
+    }
+    return {
+      status: "failed",
+      message: `Failed to run command: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+}
 async function executeCliSetup(setup, execService) {
   let anyAlreadyConfigured = false;
   for (const cmd of setup.commands) {
@@ -7295,6 +7514,52 @@ async function executeCliSetup(setup, execService) {
   }
   return { status: "success", message: "Configured successfully" };
 }
+async function executeCliUninstall(uninstall, execService) {
+  if (uninstall.commands.length === 0) {
+    return {
+      status: "failed",
+      message: "No uninstall commands configured."
+    };
+  }
+  let anyRemoved = false;
+  let anyNotConfigured = false;
+  const warnings = [];
+  for (let index = 0;index < uninstall.commands.length; index += 1) {
+    const cmd = uninstall.commands[index];
+    const result = await executeCliUninstallCommand(cmd, execService);
+    if (result.status === "failed") {
+      if (anyRemoved) {
+        warnings.push(result.message);
+        continue;
+      }
+      return result;
+    }
+    if (result.status === "removed") {
+      anyRemoved = true;
+    }
+    if (result.status === "not_configured") {
+      if (anyRemoved) {
+        warnings.push(result.message);
+        continue;
+      }
+      anyNotConfigured = true;
+    }
+  }
+  if (anyRemoved) {
+    return {
+      status: "removed",
+      message: "Removed successfully",
+      warnings: warnings.length > 0 ? warnings : undefined
+    };
+  }
+  if (anyNotConfigured) {
+    return {
+      status: "not_configured",
+      message: `GitHits not configured via ${uninstall.commands[0]?.command}`
+    };
+  }
+  return { status: "removed", message: "Removed successfully" };
+}
 async function executeConfigFileSetup(setup, fs) {
   try {
     const parentDir = fs.getDirname(setup.configPath);
@@ -7338,6 +7603,51 @@ async function executeConfigFileSetup(setup, fs) {
     };
   }
 }
+async function executeConfigFileUninstall(setup, fs) {
+  try {
+    let existingContent = "";
+    try {
+      existingContent = await fs.readFile(setup.configPath);
+    } catch (err) {
+      if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+        return {
+          status: "not_configured",
+          message: `GitHits not configured in ${setup.configPath}`
+        };
+      }
+      return {
+        status: "failed",
+        message: `Cannot read ${setup.configPath}: ${err instanceof Error ? err.message : String(err)}`
+      };
+    }
+    const result = removeServerConfig(existingContent, setup.serversKey, setup.serverName);
+    if (result.status === "not_configured") {
+      return {
+        status: "not_configured",
+        message: `GitHits not configured in ${setup.configPath}`
+      };
+    }
+    if (result.status === "parse_error") {
+      return {
+        status: "failed",
+        message: `Cannot parse ${setup.configPath}: ${result.error}. File left unchanged.`
+      };
+    }
+    await fs.atomicWriteFile(setup.configPath, result.content);
+    return { status: "removed", message: "Removed successfully" };
+  } catch (err) {
+    if (err instanceof Error && "code" in err && err.code === "EACCES") {
+      return {
+        status: "failed",
+        message: `Permission denied writing to ${setup.configPath}. Check file permissions.`
+      };
+    }
+    return {
+      status: "failed",
+      message: `Failed to uninstall: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+}
 
 // src/commands/init/agent-definitions.ts
 var GITHITS_SERVER_NAME = "GitHits";
@@ -7347,6 +7657,10 @@ var GITHITS_MCP_INVOCATION = [
   GITHITS_MCP_COMMAND,
   ...GITHITS_MCP_ARGS
 ];
+var CLAUDE_GITHITS_PLUGIN = "githits";
+var CLAUDE_GITHITS_MARKETPLACE = "githits-plugins";
+var CLAUDE_GITHITS_PLUGIN_REF = `${CLAUDE_GITHITS_PLUGIN}@${CLAUDE_GITHITS_MARKETPLACE}`;
+var CLAUDE_GITHITS_MARKETPLACE_SOURCE = "githits-com/githits-cli";
 function getAppDataPath(fs, appName) {
   const home = fs.getHomeDir();
   switch (process.platform) {
@@ -7404,18 +7718,36 @@ var claudeCode = {
     commands: [
       {
         command: "claude",
-        args: ["plugin", "marketplace", "add", "githits-com/githits-cli"]
+        args: [
+          "plugin",
+          "marketplace",
+          "add",
+          CLAUDE_GITHITS_MARKETPLACE_SOURCE
+        ]
       },
       {
         command: "claude",
-        args: ["plugin", "install", "githits@githits-plugins"]
+        args: ["plugin", "install", CLAUDE_GITHITS_PLUGIN_REF]
       }
     ],
     checkCommand: {
       command: "claude",
       args: ["plugin", "list"],
-      configuredPattern: /githits/i
+      configuredPattern: /(^|\s)githits@githits-plugins\b/i
     }
+  }),
+  getUninstallConfig: () => ({
+    method: "cli",
+    commands: [
+      {
+        command: "claude",
+        args: ["plugin", "uninstall", CLAUDE_GITHITS_PLUGIN]
+      },
+      {
+        command: "claude",
+        args: ["plugin", "marketplace", "remove", CLAUDE_GITHITS_MARKETPLACE]
+      }
+    ]
   })
 };
 var cursor = {
@@ -7501,8 +7833,17 @@ var codexCli = {
     checkCommand: {
       command: "codex",
       args: ["mcp", "list"],
-      configuredPattern: /githits/i
+      configuredPattern: /^\s*githits\b/im
     }
+  }),
+  getUninstallConfig: () => ({
+    method: "cli",
+    commands: [
+      {
+        command: "codex",
+        args: ["mcp", "remove", "githits"]
+      }
+    ]
   })
 };
 var vscode = {
@@ -7570,6 +7911,15 @@ var geminiCli = {
       notConfiguredPattern: /not installed/i,
       requireExitCodeZero: true
     }
+  }),
+  getUninstallConfig: () => ({
+    method: "cli",
+    commands: [
+      {
+        command: "gemini",
+        args: ["extensions", "uninstall", "githits"]
+      }
+    ]
   })
 };
 async function isGeminiExtensionInstalledFromFilesystem(fs) {
@@ -7721,6 +8071,90 @@ async function verifyAgentConfigured(agent, fileSystemService, execService) {
     message: `${agent.name} verification failed: agent not detected after setup.`
   };
 }
+async function verifyAgentUnconfigured(agent, fileSystemService, execService) {
+  const postCheck = await scanAgents([agent], fileSystemService, execService);
+  if (postCheck.needsSetup.some((a) => a.id === agent.id)) {
+    return { ok: true };
+  }
+  if (postCheck.notDetected.some((a) => a.id === agent.id)) {
+    return {
+      ok: false,
+      message: `${agent.name} verification failed: agent was not detected after uninstall, so removal could not be confirmed.`
+    };
+  }
+  return {
+    ok: false,
+    message: `${agent.name} verification failed: still configured after uninstall.`
+  };
+}
+async function scanCliAgentForUninstall(agent, fileSystemService, execService) {
+  const config = agent.getSetupConfig(fileSystemService);
+  if (config.method !== "cli" || !config.checkCommand) {
+    return {
+      status: "failed",
+      message: `${agent.name} does not have a verified uninstall check command.`
+    };
+  }
+  const checkStatus = await getCliCheckStatus(config.checkCommand, execService);
+  if (checkStatus === "configured") {
+    return "configured";
+  }
+  if (checkStatus === "not_configured") {
+    return "not_configured";
+  }
+  if (agent.id === "gemini-cli" && await isGeminiExtensionInstalledFromFilesystem(fileSystemService)) {
+    return "configured";
+  }
+  return {
+    status: "failed",
+    message: `Cannot inspect ${agent.name}: ${config.checkCommand.command} ${config.checkCommand.args.join(" ")} failed.`
+  };
+}
+async function scanAgentsForUninstall(fileSystemService, execService) {
+  const setupScan = await scanAgents(agentDefinitions, fileSystemService, execService);
+  const result = {
+    configured: [],
+    notConfigured: [],
+    notDetected: setupScan.notDetected,
+    failed: []
+  };
+  for (const agent of [
+    ...setupScan.alreadyConfigured,
+    ...setupScan.needsSetup
+  ]) {
+    const config = agent.getSetupConfig(fileSystemService);
+    if (config.method === "config-file") {
+      const check = await getConfigUninstallCheckStatus(config, fileSystemService);
+      if (check.status === "configured") {
+        result.configured.push(agent);
+      } else if (check.status === "failed") {
+        result.failed.push({
+          id: agent.id,
+          name: agent.name,
+          status: "failed",
+          message: check.message
+        });
+      } else {
+        result.notConfigured.push(agent);
+      }
+    } else {
+      const check = await scanCliAgentForUninstall(agent, fileSystemService, execService);
+      if (check === "configured") {
+        result.configured.push(agent);
+      } else if (check === "not_configured") {
+        result.notConfigured.push(agent);
+      } else {
+        result.failed.push({
+          id: agent.id,
+          name: agent.name,
+          status: "failed",
+          message: check.message
+        });
+      }
+    }
+  }
+  return result;
+}
 async function initAction(options, deps) {
   const useColors = shouldUseColors();
   const { fileSystemService, promptService, execService, createLoginDeps } = deps;
@@ -7886,6 +8320,147 @@ async function initAction(options, deps) {
   }
   console.log();
 }
+async function initUninstallAction(options, deps) {
+  const useColors = shouldUseColors();
+  const { fileSystemService, promptService, execService } = deps;
+  console.log(`
+  ${colorize("GitHits", "bold", useColors)} — Remove MCP server from your coding agents
+`);
+  console.log(`  Scanning for configured agents...
+`);
+  const scan = await scanAgentsForUninstall(fileSystemService, execService);
+  for (const agent of scan.configured) {
+    console.log(`    ${colorize(`● ${agent.name} — configured`, "cyan", useColors)}`);
+  }
+  for (const agent of scan.notConfigured) {
+    console.log(`    ${warning(`${agent.name} — not configured`, useColors)}`);
+  }
+  for (const outcome of scan.failed) {
+    console.log(`    ${error(`${outcome.name} — cannot inspect config`, useColors)}`);
+  }
+  for (const agent of scan.notDetected) {
+    console.log(`    ${colorize(`${agent.name} — not detected`, "dim", useColors)}`);
+  }
+  console.log();
+  if (scan.configured.length === 0 && scan.failed.length === 0) {
+    console.log(`  No GitHits MCP configurations found. Nothing to uninstall.
+`);
+    return;
+  }
+  const outcomes = [...scan.failed];
+  let alwaysMode = options.yes ?? false;
+  for (const agent of scan.configured) {
+    console.log(`  Uninstalling from ${colorize(agent.name, "bold", useColors)}...
+`);
+    const setupConfig = agent.getSetupConfig(fileSystemService);
+    const uninstallConfig = setupConfig.method === "config-file" ? setupConfig : agent.getUninstallConfig?.(fileSystemService);
+    if (!uninstallConfig) {
+      outcomes.push({
+        id: agent.id,
+        name: agent.name,
+        status: "failed",
+        message: `${agent.name} does not have a verified uninstall command.`
+      });
+      console.log(`    ${error(`${agent.name} does not have a verified uninstall command.`, useColors)}
+`);
+      continue;
+    }
+    const preview = formatUninstallPreview(uninstallConfig);
+    for (const line of preview.split(`
+`)) {
+      console.log(`    ${line}`);
+    }
+    console.log();
+    if (!alwaysMode) {
+      let choice;
+      try {
+        choice = await promptService.confirm3("Proceed?");
+      } catch (err) {
+        if (err instanceof ExitPromptError) {
+          console.log(`
+  Uninstall cancelled.
+`);
+          return;
+        }
+        throw err;
+      }
+      if (choice === "no") {
+        outcomes.push({ id: agent.id, name: agent.name, status: "skipped" });
+        console.log();
+        continue;
+      }
+      if (choice === "always") {
+        alwaysMode = true;
+      }
+    }
+    let result = uninstallConfig.method === "cli" ? await executeCliUninstall(uninstallConfig, execService) : await executeConfigFileUninstall(uninstallConfig, fileSystemService);
+    if (result.status === "removed") {
+      const verification = await verifyAgentUnconfigured(agent, fileSystemService, execService);
+      if (!verification.ok) {
+        result = {
+          status: "failed",
+          message: verification.message ?? `${agent.name} verification failed after uninstall.`,
+          warnings: result.warnings
+        };
+      }
+    }
+    outcomes.push({
+      id: agent.id,
+      name: agent.name,
+      status: result.status,
+      message: result.status === "failed" ? result.message : undefined,
+      warnings: result.warnings
+    });
+    if (result.status === "removed") {
+      console.log(`    ${success(`${agent.name} removed`, useColors)}
+`);
+      for (const warn of result.warnings ?? []) {
+        console.log(`    ${warning(`Warning: ${warn}`, useColors)}`);
+      }
+    } else if (result.status === "not_configured") {
+      console.log(`    ${warning(`${agent.name} was not configured`, useColors)}
+`);
+    } else {
+      console.log(`    ${error(result.message, useColors)}
+`);
+      for (const warn of result.warnings ?? []) {
+        console.log(`    ${warning(`Warning: ${warn}`, useColors)}`);
+      }
+    }
+  }
+  const removed = outcomes.filter((o) => o.status === "removed").length;
+  const notConfigured = outcomes.filter((o) => o.status === "not_configured").length + scan.notConfigured.length;
+  const failed = outcomes.filter((o) => o.status === "failed").length;
+  const skipped = outcomes.filter((o) => o.status === "skipped").length;
+  if (failed > 0) {
+    console.log("  Uninstall completed with errors.");
+  } else if (removed > 0) {
+    console.log("  Done! GitHits MCP configuration was removed.");
+  } else if (skipped > 0) {
+    console.log("  Uninstall skipped.");
+  } else if (notConfigured > 0) {
+    console.log("  No GitHits MCP configurations were active. Nothing to remove.");
+  }
+  if (removed > 0) {
+    console.log(`  ${removed} agent${removed !== 1 ? "s" : ""} removed.`);
+  }
+  if (notConfigured > 0) {
+    console.log(`  ${notConfigured} agent${notConfigured !== 1 ? "s" : ""} not configured.`);
+  }
+  if (skipped > 0) {
+    console.log(`  ${skipped} agent${skipped !== 1 ? "s" : ""} skipped.`);
+  }
+  if (failed > 0) {
+    console.log(`  ${failed} agent${failed !== 1 ? "s" : ""} failed to uninstall.`);
+    for (const outcome of outcomes.filter((o) => o.status === "failed")) {
+      console.log(`    - ${outcome.name}: ${outcome.message ?? "Unknown error"}`);
+      for (const warn of outcome.warnings ?? []) {
+        console.log(`      Warning: ${warn}`);
+      }
+    }
+  }
+  console.log();
+}
 function printAuthRecoveryHint() {
   console.log("    You can still configure MCP, but GitHits tools will require auth.");
   console.log("    Recovery steps:");
@@ -7905,8 +8480,13 @@ and sets up unconfigured ones with your confirmation.
 Supports CLI-based setup (Claude Code, Codex, Gemini CLI) and config
 file editing (Cursor, Windsurf, VS Code, Cline, Claude Desktop,
 Google Antigravity) with atomic writes.`;
+var INIT_UNINSTALL_DESCRIPTION = `Remove GitHits MCP server configuration from your coding agents.
+
+Scans for available agents that currently have GitHits configured, then removes
+only the GitHits MCP/plugin configuration with your confirmation. Authentication
+tokens are not removed; use \`githits logout\` to remove stored credentials.`;
 function registerInitCommand(program) {
-  program.command("init").summary("Set up MCP server for your coding agents").description(INIT_DESCRIPTION).option("-y, --yes", "Skip prompts, configure all detected agents").option("--skip-login", "Skip authentication step").action(async (options) => {
+  const initCommand = program.command("init").summary("Set up MCP server for your coding agents").description(INIT_DESCRIPTION).option("-y, --yes", "Skip prompts, configure all detected agents").option("--skip-login", "Skip authentication step").action(async (options) => {
     const fileSystemService = new FileSystemServiceImpl;
     const promptService = new PromptServiceImpl;
     const execService = new ExecServiceImpl;
@@ -7917,6 +8497,16 @@ function registerInitCommand(program) {
       createLoginDeps: () => createAuthCommandDependencies()
     });
   });
+  initCommand.command("uninstall").summary("Remove MCP server from your coding agents").description(INIT_UNINSTALL_DESCRIPTION).option("-y, --yes", "Skip prompts, uninstall from all configured agents").action(async (options) => {
+    const fileSystemService = new FileSystemServiceImpl;
+    const promptService = new PromptServiceImpl;
+    const execService = new ExecServiceImpl;
+    await initUninstallAction(options, {
+      fileSystemService,
+      promptService,
+      execService
+    });
+  });
 }
 // src/commands/languages.ts
 async function languagesAction(query, options, deps) {
@@ -8178,7 +8768,7 @@ function invalidTargetResult(message) {
 // src/tools/grep-repo.ts
 var schema3 = {
   target: codeTargetSchema,
-  pattern: z4.string().describe(GREP_REPO_PATTERN_NOTE),
+  pattern: z4.string().optional().describe(GREP_REPO_PATTERN_NOTE),
   path: z4.string().optional().describe("Exact file path to grep. Shares the same path vocabulary as `code_read`."),
   path_prefix: z4.string().optional().describe("Literal directory prefix to scope grep, matching `code_files` / `search` naming."),
   globs: z4.array(z4.string()).optional().describe("Repeatable glob scopes with real glob semantics (e.g. `src/**/*.ts`)."),
@@ -8197,7 +8787,7 @@ var schema3 = {
   wait_timeout_ms: z4.number().optional(),
   format: z4.enum(["json", "text", "text-v1"]).optional().describe('Response format. Default `text-v1` — compact line-oriented output (matches grouped by file with grep -A/-B notation for context). Pass `format: "json"` for the structured envelope. `text` is an alias for `text-v1`. Errors stay JSON-formatted in either mode for now.')
 };
-var DESCRIPTION3 = "Deterministic text or regex grep over indexed dependency and repository source files. " + 'Use this when you know the pattern (literal by default; pass `pattern_type: "regex"` for RE2). ' + "Use `search` for discovery instead. " + "Whole-target grep is the default — narrow with `path`, `path_prefix`, `globs`, or `extensions` to keep responses small. " + "Each match's `path` chains into `code_read.path`; pick a window around `match.line` for `code_read.start_line` / `end_line`.";
+var DESCRIPTION3 = "Deterministic text or regex grep over indexed dependency and repository source files. " + 'Use this when you know the pattern (literal by default; pass `pattern_type: "regex"` for RE2). ' + "Use `search` for discovery instead. " + "Whole-target grep is the default — narrow with `path`, `path_prefix`, `globs`, or `extensions` to keep responses small. " + "Each match's `filePath` (or text file heading) chains into `code_read.path`; pick a window around `match.line` for `code_read.start_line` / `end_line`.";
 function createGrepRepoTool(service) {
   return {
     name: "code_grep",
@@ -8292,7 +8882,7 @@ var schema4 = {
   wait_timeout_ms: z5.number().optional().describe("Max milliseconds to wait for indexing (0–60000, default 20000). On an `INDEXING` error envelope, retry with a longer timeout or pass a version from `details.availableVersions`."),
   format: z5.enum(["json", "text", "text-v1"]).optional().describe('Response format. Default `text-v1` — compact paths-only listing. Pass `format: "json"` for the structured envelope. `text` is an alias for `text-v1`. Errors stay JSON-formatted in either mode for now.')
 };
-var DESCRIPTION4 = "List files in an indexed dependency. Use this to discover paths " + "before `code_read` (when `code_read` returns `FILE_NOT_FOUND` or " + "you don't yet know the path) and to scope `code_grep`. Address " + "via `target.registry` + `target.package_name` (package scope) or " + "`target.repo_url` + `target.git_ref` (repo scope), mutually " + "exclusive. Narrow with `path`, `path_prefix`, `globs`, " + "`extensions`, `file_types`, `languages`, or file-intent filters. " + "JSON envelope shape: `{total, hasMore, files: [{path, name, " + "language, fileType, byteSize}], resolution, indexedVersion}`. " + "Returns an `INDEXING` error envelope when the dependency is being " + "indexed on-demand — retry with a longer `wait_timeout_ms` or use " + "a version from `details.availableVersions`.";
+var DESCRIPTION4 = "List files in an indexed dependency. First choice for file/path " + "enumeration tasks such as files under a directory; use " + "`path_prefix` for directory prefixes (e.g. `lib/`) and optional " + "`extensions` for language filtering. Use this to discover paths " + "before `code_read` (when `code_read` returns `FILE_NOT_FOUND` or " + "you don't yet know the path) and to scope `code_grep`. Address " + "via `target.registry` + `target.package_name` (package scope) or " + "`target.repo_url` + `target.git_ref` (repo scope), mutually " + "exclusive. Narrow with `path`, `path_prefix`, `globs`, " + "`extensions`, `file_types`, `languages`, or file-intent filters. " + "JSON envelope shape: `{total, hasMore, files: [{path, name, " + "language, fileType, byteSize}], resolution, indexedVersion}`. " + "Returns an `INDEXING` error envelope when the dependency is being " + "indexed on-demand — retry with a longer `wait_timeout_ms` or use " + "a version from `details.availableVersions`.";
 function createListFilesTool(service) {
   return {
     name: "code_files",
@@ -8371,7 +8961,7 @@ var schema5 = {
   after: z6.string().optional().describe("Pagination cursor from a prior response."),
   format: z6.enum(["json", "text", "text-v1"]).optional().describe('Response format. Default `text-v1` — compact page list with ready-to-call `docs_read` follow-ups. Pass `format: "json"` for the structured envelope.')
 };
-var DESCRIPTION5 = "List mixed package documentation pages from hosted docs and repository-backed docs. " + "Every entry includes a stable `pageId`, `sourceKind` (`crawled` or `repo`), and source URL; repo-backed entries also expose `repoUrl` / `gitRef` / `filePath` for exact file reads. " + "Pass a returned `pageId` to `docs_read`. Use this to browse before reading a full page.";
+var DESCRIPTION5 = "List mixed package documentation pages from hosted docs and repository-backed docs. " + 'This browses available pages; for topic search, use `search` with `sources: ["docs"]` and pass the returned `pageId` to `docs_read`. ' + "Every entry includes a stable `pageId`, `sourceKind` (`crawled` or `repo`), and source URL; repo-backed entries also expose `repoUrl` / `gitRef` / `filePath` for exact file reads. " + "Pass a returned `pageId` to `docs_read`. Use this to browse before reading a full page.";
 function createListPackageDocsTool(service) {
   return {
     name: "docs_list",
@@ -8781,7 +9371,7 @@ var schema7 = {
   max_depth: z8.number().int().min(1).max(10).optional().describe("Cap the transitive traversal at this depth (1–10). Omit to get the backend's full graph. Requires `include_transitive: true` — passing `max_depth` without the transitive flag is rejected with `INVALID_ARGUMENT`."),
   format: z8.enum(["json", "text", "text-v1"]).optional().describe('Response format. Default `text-v1` — compact dependency listing. Pass `format: "json"` for the structured envelope.')
 };
-var DESCRIPTION7 = "Analyze a package's dependency graph. Lists direct runtime " + "dependencies with resolved versions; non-runtime groups are " + "omitted by default. Use `lifecycle` with a concrete value for " + "runtime plus matching groups, or `all` for runtime plus every " + "available group. Set `include_transitive: true` to add a " + "`transitive` block with the full install footprint, conflict " + "detection, and circular-dependency flags; layer " + "`include_importers: true` on top when you also need per-package " + "provenance. Supports npm, PyPI, Hex, Crates, Zig, vcpkg, RubyGems, " + "and Go.";
+var DESCRIPTION7 = "Analyze a package's dependency graph. Lists direct runtime " + "dependencies with resolved versions; non-runtime groups are " + "omitted by default. Use `lifecycle` with a concrete value for " + "matching dependency groups, or `all` for every available group. " + "Runtime group rows include resolved versions when available. " + "Set `include_transitive: true` to add a " + "`transitive` block with the full install footprint, conflict " + "detection, and circular-dependency flags; layer " + "`include_importers: true` on top when you also need per-package " + "provenance. Supports npm, PyPI, Hex, Crates, Zig, vcpkg, RubyGems, " + "and Go.";
 function createPackageDependenciesTool(service) {
   return {
     name: "pkg_deps",
@@ -8974,13 +9564,13 @@ import { z as z11 } from "zod";
 var MCP_READ_MAX_SPAN = 150;
 var schema10 = {
   target: codeTargetSchema,
-  path: z11.string().describe("Path to the file. Package addressing: package-relative. Repo addressing: repo-relative. This is the same `path` key that `code_files` emits for each entry, so chaining needs no renaming."),
+  path: z11.string().describe("Exact file path to read, not a directory. Package addressing: package-relative. Repo addressing: repo-relative. Use `code_files` with `path_prefix` to list directories, then pass an emitted `path` here."),
   start_line: z11.number().optional().describe(`Starting line (1-indexed). Omit to start at line 1. The MCP surface caps any single read at ${MCP_READ_MAX_SPAN} lines — pick a focused window from your prior \`search\` / \`code_grep\` hit.`),
   end_line: z11.number().optional().describe(`Ending line (inclusive). Must be ≥ \`start_line\` when both are set. Omitting it implies \`start_line + ${MCP_READ_MAX_SPAN - 1}\` because the MCP surface caps each read at ${MCP_READ_MAX_SPAN} lines.`),
   wait_timeout_ms: z11.number().optional().describe("Max milliseconds to wait for indexing (0–60000, default 20000). On an `INDEXING` error envelope, retry with a longer timeout or pass a version from `details.availableVersions`."),
   format: z11.enum(["json", "text", "text-v1"]).optional().describe('Response format. Default `text-v1` — line-numbered source content. Pass `format: "json"` for the structured envelope.')
 };
-var DESCRIPTION10 = "Read a file from an indexed dependency. **MCP cap: " + `${MCP_READ_MAX_SPAN} lines per call** — broader requests (or no ` + `range) silently truncate to the first ${MCP_READ_MAX_SPAN} lines ` + "from your start, with a `hint` describing what was returned vs. " + "requested. Pick a focused window from a `search` / `code_grep` " + "match. Response: `{path, language, totalLines, startLine, endLine, " + "content, isBinary, hint?}`. Binary files set `isBinary: true` and " + "omit `content`. Pass the same `path` emitted by `code_files`. " + "Address via `target.registry` + `target.package_name` (package " + "scope) or `target.repo_url` + `target.git_ref` (repo scope), " + "mutually exclusive. On `INDEXING` retry with a longer " + "`wait_timeout_ms`. On `NOT_FOUND` / `FILE_NOT_FOUND` call " + "`code_files` to discover the actual path.";
+var DESCRIPTION10 = "Read one exact file from an indexed dependency; it does not list " + "directories. Use `code_files` with `path_prefix` for file/path " + "enumeration. **MCP cap: " + `${MCP_READ_MAX_SPAN} lines per call** — broader requests (or no ` + `range) silently truncate to the first ${MCP_READ_MAX_SPAN} lines ` + "from your start, with a `hint` describing what was returned vs. " + "requested. Pick a focused window from a `search` / `code_grep` " + "match. Response: `{path, language, totalLines, startLine, endLine, " + "content, isBinary, hint?}`. Binary files set `isBinary: true` and " + "omit `content`. Pass the same `path` emitted by `code_files`. " + "Address via `target.registry` + `target.package_name` (package " + "scope) or `target.repo_url` + `target.git_ref` (repo scope), " + "mutually exclusive. On `INDEXING` retry with a longer " + "`wait_timeout_ms`. On `NOT_FOUND` / `FILE_NOT_FOUND` call " + "`code_files` to discover the actual path.";
 function deriveBoundedRange(startLine, endLine) {
   const start = startLine ?? 1;
   if (endLine === undefined) {
@@ -9035,7 +9625,7 @@ function createReadFileTool(service) {
         }
         return textResult(JSON.stringify(payload));
       } catch (error2) {
-        const mapped = mapCodeNavigationError(error2);
+        const mapped = withReadFileRecovery(mapCodeNavigationError(error2), args.path);
         return errorResult(JSON.stringify({
           error: mapped.message,
           code: mapped.code,
@@ -9378,23 +9968,23 @@ Package spec: \`registry:name[@version]\`. Default outputs are compact \`text-v1
 var MULTI_TURN_TIP = '**Delegate multi-call work to a sub-agent.** Code-navigation work (`search`, `code_grep`, `code_read`, `code_files`) often takes 3-10 calls. For cross-project comparisons, codebase mapping, pattern surveys, or "how does X actually work" investigations, spawn a sub-task/sub-agent and ask for a compact synthesis. Do it inline only when the raw snippet belongs in the main conversation.';
 var SEARCH_BULLET = '- `search` — unified search across indexed dependency code, docs, and symbols. Omit `sources` for AUTO. Use `sources:["code"]` for implementation/examples/tests text, `sources:["symbol"]` for precise API/entity lookup, and `sources:["docs"]` for guides/reference/changelogs. Default output is compact `text-v1` with ready-to-call follow-up arguments; pass `format: "json"` for structured locators, highlights, and source status. Complete by default; opt into partial hits with `allow_partial_results: true`. Incomplete responses carry a `searchRef`.';
 var SEARCH_STATUS_BULLET = "- `search_status` — follow up a prior `search` by `searchRef` to check progress, fetch partial hits, or fetch final results.";
-var CODE_GREP_BULLET = "- `code_grep` — deterministic text or regex grep over indexed source. Use it when you know the pattern; use `search` for discovery. Narrow with `path`, `path_prefix`, `globs`, or `extensions`. Each match's `path:line` chains into `code_read`.";
-var CODE_READ_BULLET = "- `code_read` — read a dependency file by `path`. **MCP cap: 150 lines per call**. When you already have an exact path (e.g. from a stack trace), call this directly; otherwise locate it first with `search` or `code_grep` and pick a focused `start_line` / `end_line` window. Binary files set `isBinary: true` and omit `content`. On `FILE_NOT_FOUND` / `NOT_FOUND`, call `code_files` for the actual path.";
-var CODE_FILES_BULLET = '- `code_files` — list files in an indexed dependency. `path`, `path_prefix`, and `globs` are OR-ed selectors; extensions, language, file type, and file-intent filters intersect on top. Returned paths feed into `code_read` and help scope `code_grep`; pass `format: "json"` for language/type/size metadata.';
-var DOCS_LIST_BULLET = "- `docs_list` — browse hosted and repository-backed package docs. Entries include stable pageIds, source URLs, and repo-file follow-up metadata when available.";
-var DOCS_READ_BULLET = "- `docs_read` — read a documentation page by pageId. Works for both hosted docs and repo-backed docs.";
+var CODE_GREP_BULLET = "- `code_grep` — deterministic text or regex grep over indexed source. Use it when you know the pattern; use `search` for discovery. Narrow with `path`, `path_prefix`, `globs`, or `extensions`. Each match's `filePath`/file heading plus line number chains into `code_read`.";
+var CODE_READ_BULLET = "- `code_read` — read one exact dependency file by `path`; do not use it to probe/list directories like `lib` or `lib/`. **MCP cap: 150 lines per call**. When you already have an exact path (e.g. from a stack trace), call this directly; otherwise locate it first with `search`, `code_grep`, or `code_files` and pick a focused `start_line` / `end_line` window. Binary files set `isBinary: true` and omit `content`. On `FILE_NOT_FOUND` / `NOT_FOUND`, follow `details.action` or call `code_files` for the actual path.";
+var CODE_FILES_BULLET = '- `code_files` — list or discover file paths in an indexed dependency. First choice for file-listing/path-enumeration tasks such as "files under lib/" (`path_prefix: "lib/"`, optional `extensions: ["js"]`); do not use `code_read` to probe directories and do not use `code_grep` with empty or generic patterns to list files. `path`, `path_prefix`, and `globs` are OR-ed selectors; extensions, language, file type, and file-intent filters intersect on top. Returned paths feed into `code_read` and help scope `code_grep`; pass `format: "json"` for language/type/size metadata.';
+var DOCS_LIST_BULLET = '- `docs_list` — browse hosted and repository-backed package docs when you need the available pages. It is not topic search; for "find docs about X", call `search` with `sources:["docs"]`, then pass the returned `pageId` to `docs_read`. Entries include stable pageIds, source URLs, and repo-file follow-up metadata when available.';
+var DOCS_READ_BULLET = "- `docs_read` — read a documentation page by pageId. Works for both hosted docs and repo-backed docs. Prefer focused `start_line` / `end_line` windows from `search` hits or prior `docs_read` `totalLines` metadata instead of rereading large pages.";
 var PKG_INFO_BULLET = '- `pkg_info` — latest-version package triage by `registry` + `package_name` (e.g. `npm` + `express`): license, repository popularity, downloads, publish age, and vulnerability status. Set `verbose: true` for GitHub language/topics/last-pushed, recent advisories, and recent changes; pass `format: "json"` for structured fields.';
 var PKG_VULNS_BULLET = '- `pkg_vulns` — compact known CVE / OSV advisory summary for npm, PyPI, Hex, Crates, NuGet, Maven, Packagist, RubyGems, or Go packages; vcpkg and Zig are not supported. Optionally pin `version` (e.g. `npm` + `lodash` + `4.17.20`). Filter with `min_severity`; include retracted advisories with `include_withdrawn`; set `advisory_scope: "non_affecting"` for historical advisories or `"all"` for affected + historical rows. Default text is capped; use `verbose: true` for all selected rows or `format: "json"` for the complete per-advisory envelope.';
 var PKG_DEPS_BULLET = '- `pkg_deps` — compact direct runtime deps by default. Use `lifecycle: "runtime"` for explicit runtime-only, a concrete lifecycle for runtime plus matching non-runtime deps, or `lifecycle: "all"` for all groups. Use `include_transitive` for the full graph and `include_importers` for provenance. Pass `format: "json"` for the structured envelope.';
 var PKG_CHANGELOG_BULLET = '- `pkg_changelog` — compact release notes for a package or GitHub repo, newest-first (e.g. `npm` + `express` + `limit: 2`). Default latest mode returns recent entries with 10-line markdown previews; `from_version` switches to range mode. Set `body_lines` to tune text previews, `verbose: true` for full text bodies, `include_bodies: false` for a compact timeline, or `format: "json"` for the complete envelope.';
-var STRATEGY_TIP = 'Strategy — reference-first. Locate symbols and lines with `search` or `code_grep` first, then read the needed window with `code_read` using explicit `start_line` / `end_line` (typical 80-150 lines around the match; the MCP `code_read` surface caps each call at 150 lines). Source, symbols, tests, and call sites beat docs prose for behavioral claims; use `sources:["symbol"]` when you want symbol-shaped results, `code_grep` for deterministic text matching, and `get_example` for global canonical examples after package-scoped grounding.';
+var STRATEGY_TIP = 'Strategy — reference-first. For file/path enumeration, call `code_files` directly; never test directory paths with `code_read`. For behavioral claims, locate symbols and lines with `search` or `code_grep` first, then read the needed window with `code_read` using explicit `start_line` / `end_line` (typical 80-150 lines around the match; the MCP `code_read` surface caps each call at 150 lines). Source, symbols, tests, and call sites beat docs prose; use `sources:["symbol"]` when you want symbol-shaped results, `code_grep` for deterministic text matching, and `get_example` for global canonical examples after package-scoped grounding.';
 function buildMcpInstructions(_deps) {
   const bullets = [
     SEARCH_BULLET,
     SEARCH_STATUS_BULLET,
+    CODE_FILES_BULLET,
     CODE_GREP_BULLET,
     CODE_READ_BULLET,
-    CODE_FILES_BULLET,
     DOCS_LIST_BULLET,
     DOCS_READ_BULLET,
     PKG_INFO_BULLET,
@@ -9506,14 +10096,14 @@ Authenticated tool calls require a valid GitHits token.`).action(async () => {
       showMcpSetupInstructions();
       return;
     }
-    const deps = await createContainer();
+    const deps = await createContainer({ resolveStoredToken: false });
     await startMcpServer(deps);
   });
   mcpCommand.command("start").summary("Start MCP server (stdio mode)").description(`Start the MCP server using STDIO transport.
 
 This command explicitly starts the server and is intended for use
 in MCP configuration files. Use 'githits mcp' for interactive setup.`).action(async () => {
-    const deps = await createContainer();
+    const deps = await createContainer({ resolveStoredToken: false });
     await startMcpServer(deps);
   });
 }
@@ -9744,7 +10334,7 @@ function formatDepsTerminalError(mapped) {
 var PKG_DEPS_DESCRIPTION = `Analyze package dependencies. By default shows the flat list of
 direct runtime dependencies. Use --lifecycle all for the structured view
 (dev / peer / build / optional, plus registry-specific feature / TFM
-groups). Concrete --lifecycle values include runtime plus matching groups.
+groups). Runtime group rows include resolved versions when available.
 --transitive opts into aggregate edge / unique-package counts,
 conflict detection, and circular-dependency flags.
 
@@ -10067,7 +10657,7 @@ function requireSearchService(deps) {
   return deps.codeNavigationService;
 }
 async function loadContainer2() {
-  const { createContainer: createContainer2 } = await import("./shared/chunk-kmka6wpx.js");
+  const { createContainer: createContainer2 } = await import("./shared/chunk-k35egwwf.js");
   return createContainer2();
 }
 function parseTargetSpecs(specs) {
@@ -10177,13 +10767,13 @@ function formatUnifiedSearchTerminal(payload) {
 `).trimEnd();
   }
   const { display, duplicatesFolded } = dedupeSearchResultsForDisplay(payload.results);
-  const baseCount = `${display.length} result(s)`;
+  const baseCount = `${display.length} result${display.length === 1 ? "" : "s"}`;
   const countSuffix = [
     payload.hasMore ? " (more available)" : "",
     duplicatesFolded > 0 ? ` (+${duplicatesFolded} near-duplicate folded)` : ""
   ].join("");
-  lines.push(`${highlight(baseCount, useColors)}${dim(countSuffix, useColors)}`);
-  lines.push(dim(formatUnifiedSearchTypeSummary(display), useColors));
+  const typeSummary = formatUnifiedSearchTypeSummary(display);
+  lines.push(`${highlight(baseCount, useColors)}${dim(countSuffix, useColors)}${typeSummary ? dim(` | ${typeSummary}`, useColors) : ""}`);
   lines.push("");
   for (const entry of display) {
     const location = formatUnifiedSearchLocation(entry.locator);
@@ -10333,7 +10923,7 @@ function formatUnifiedSearchTypeSummary(results) {
   for (const result of results) {
     counts.set(result.type, (counts.get(result.type) ?? 0) + 1);
   }
-  return Array.from(counts.entries()).map(([type, count]) => formatUnifiedSearchCountLabel(type, count)).join(" · ");
+  return Array.from(counts.entries()).map(([type, count]) => formatUnifiedSearchCountLabel(type, count)).join(", ");
 }
 function formatUnifiedSearchResultLabel(type) {
   switch (type) {
@@ -10386,11 +10976,33 @@ function formatUnifiedSearchLocation(locator) {
   return `${locator.filePath}:${locator.startLine}${locator.endLine && locator.endLine !== locator.startLine ? `-${locator.endLine}` : ""}`;
 }
 function formatUnifiedSearchHeader(entry, useColors, location, rawQuery) {
+  if (entry.type === "documentation_page") {
+    return formatDocumentationPageHeader(entry, useColors);
+  }
   const primary = formatUnifiedSearchPrimary(entry.type, entry.target, location, rawQuery, useColors);
   const badge = `[${formatUnifiedSearchResultLabel(entry.type)}]`;
   const title = entry.title ? highlightRanges(entry.title, entry.highlights?.title, useColors) : undefined;
   return `${primary} ${dim(badge, useColors)}${title ? ` - ${title}` : ""}`;
 }
+function formatDocumentationPageHeader(entry, useColors) {
+  const pageId = entry.locator.pageId ?? "unknown";
+  const title = entry.title ? highlightRanges(entry.title, entry.highlights?.title, useColors) : "Untitled documentation page";
+  const source = entry.locator.sourceUrl ? ` - ${formatDisplayUrl(entry.locator.sourceUrl)}` : "";
+  const target = formatDocsPageTarget2(entry.locator, entry.target);
+  return `${highlight(pageId, useColors)} ${dim("[docs page]", useColors)}${target ? ` ${dim(target, useColors)}` : ""} - ${title}${dim(source, useColors)}`;
+}
+function formatDisplayUrl(value) {
+  return value.replace(/^https?:\/\//, "");
+}
+function formatDocsPageTarget2(locator, fallbackTarget) {
+  return locator.registry && locator.packageName ? `${locator.registry}:${locator.packageName}` : stripVersionFromTarget2(fallbackTarget);
+}
+function stripVersionFromTarget2(value) {
+  if (!value)
+    return "";
+  const atIndex = value.lastIndexOf("@");
+  return atIndex > 0 ? value.slice(0, atIndex) : value;
+}
 function formatUnifiedSearchPrimary(type, target, location, rawQuery, useColors) {
   const formattedTarget = highlight(target, useColors);
   if (type === "documentation_page" || !location) {
@@ -10498,14 +11110,8 @@ function formatUnifiedSearchMetadata(entry, useColors) {
     return [];
   }
   const lines = [];
-  if (entry.locator.pageId) {
-    if (entry.type === "documentation_page") {
-      lines.push(`  ${dim("pageId:", useColors)} ${entry.locator.pageId}`);
-    }
-  }
-  const sourceBadge = entry.locator.sourceKind?.toLowerCase() === "repository" ? "[repo]" : entry.locator.sourceKind?.toLowerCase() === "crawled" ? "[crawled]" : undefined;
-  if (entry.locator.sourceUrl && entry.type === "documentation_page") {
-    lines.push(`  ${dim("source:", useColors)} ${sourceBadge ? `${sourceBadge} ` : ""}${entry.locator.sourceUrl}`);
+  if (entry.type === "documentation_page") {
+    return lines;
   }
   return lines;
 }
@@ -10544,6 +11150,8 @@ if (isTelemetryEnabled()) {
 }
 var rootCliPreAction = createRootCliPreAction({
   createContainer,
+  loadAuthSessionMetadata: loadAutoLoginAuthSessionMetadata,
+  clearAuthSessionMetadata: clearAutoLoginAuthSessionMetadata,
   loginFlow: (options, deps) => loginFlow(options, deps, stderrLoginOutput)
 });
 program.name("githits").description("Code examples from global open source for your AI assistant").version(version).option("--no-color", "Disable colored output").hook("preAction", async (thisCommand, actionCommand) => {