githits 0.4.5 → 0.4.6

package/dist/cli.js

@@ -51,11 +51,11 @@ import {
   shouldRunUpdateCheck,
   startTelemetrySpan,
   withTelemetrySpan
-} from "./shared/chunk-ygqss6gp.js";
+} from "./shared/chunk-f16s86ze.js";
 import {
   __require,
   version
-} from "./shared/chunk-vfyz65v1.js";
+} from "./shared/chunk-a1hzwt2m.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -583,6 +583,12 @@ function classify(error2) {
     if (error2.availableVersions && error2.availableVersions.length > 0) {
       details.availableVersions = error2.availableVersions;
     }
+    if (error2.availableRefs && error2.availableRefs.length > 0) {
+      details.availableRefs = error2.availableRefs;
+    }
+    if (error2.targetResolution) {
+      details.targetResolution = error2.targetResolution;
+    }
     return {
       code: "INDEXING",
       message: error2.message,
@@ -788,7 +794,7 @@ function parseCodeNavigationTargetSpec(spec) {
 function parseRepoTarget(spec) {
   const hashIndex = spec.lastIndexOf("#");
   if (hashIndex === -1) {
-    throw new InvalidArgumentError("Repository target must include #gitRef for code_files/code_read/code_grep.");
+    return { repoUrl: spec };
   }
   const repoUrl = spec.slice(0, hashIndex);
   const gitRef = spec.slice(hashIndex + 1);
@@ -827,6 +833,7 @@ function buildSearchHitFollowUpCommand(hit) {
       version: loc.version,
       repoUrl: loc.repoUrl,
       gitRef: loc.gitRef,
+      requestedRef: loc.requestedRef,
       filePath: loc.filePath,
       startLine: loc.startLine,
       endLine: loc.endLine,
@@ -863,9 +870,8 @@ function buildTargetSpec(input) {
     return `${input.registry}:${input.packageName}${input.version ? `@${input.version}` : ""}`;
   }
   if (input.repoUrl) {
-    if (!input.gitRef)
-      return;
-    return `${input.repoUrl}#${input.gitRef}`;
+    const ref = input.gitRef ?? input.requestedRef;
+    return ref ? `${input.repoUrl}#${ref}` : input.repoUrl;
   }
   if (input.registry && input.packageName) {
     return `${input.registry}:${input.packageName}${input.version ? `@${input.version}` : ""}`;
@@ -1061,6 +1067,161 @@ function shellQuote(value) {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }
 
+// src/shared/target-resolution.ts
+function projectTargetResolution(resolution) {
+  if (!resolution)
+    return;
+  return {
+    ...resolution.requested ? { requested: projectIdentity(resolution.requested) } : {},
+    ...resolution.resolvedRequested ? { resolvedRequested: projectIdentity(resolution.resolvedRequested) } : {},
+    ...resolution.served ? { served: projectIdentity(resolution.served) } : {},
+    ...resolution.freshness ? { freshness: resolution.freshness } : {},
+    ...resolution.freshnessReason ? { freshnessReason: resolution.freshnessReason } : {},
+    ...resolution.indexingRef ? { indexingRef: resolution.indexingRef } : {},
+    availableVersions: resolution.availableVersions.map(projectArtifact),
+    availableRefs: resolution.availableRefs.map(projectArtifact)
+  };
+}
+function buildTargetResolutionNotes(resolution) {
+  if (!resolution)
+    return [];
+  const lines = [];
+  const requested = formatIdentity(resolution.requested);
+  const fresh = formatIdentity(resolution.resolvedRequested);
+  const served = formatIdentity(resolution.served);
+  const reason = resolution.freshnessReason ? ` (${resolution.freshnessReason})` : "";
+  switch (resolution.freshness) {
+    case "fallback_recent": {
+      const parts = ["using recent index"];
+      if (served)
+        parts.push(`served=${served}`);
+      if (fresh && identitiesMateriallyDiffer(fresh, served)) {
+        parts.push(`fresh=${fresh}`);
+      }
+      lines.push(`${parts.join(" | ")}${reason}`);
+      break;
+    }
+    case "indexing": {
+      const parts = ["indexing fresh target"];
+      if (requested)
+        parts.push(`requested=${requested}`);
+      if (fresh)
+        parts.push(`fresh=${fresh}`);
+      if (resolution.indexingRef)
+        parts.push(`indexingRef=${resolution.indexingRef}`);
+      lines.push(`${parts.join(" | ")}${reason}`);
+      break;
+    }
+    case "unavailable": {
+      const parts = ["target unavailable"];
+      if (requested)
+        parts.push(`requested=${requested}`);
+      lines.push(`${parts.join(" | ")}${reason}`);
+      break;
+    }
+    case "current": {
+      break;
+    }
+    default: {
+      if (resolution.freshness || identitiesDiffer(requested, fresh, served)) {
+        const parts = [
+          `target resolution: ${resolution.freshness ?? "unknown"}`
+        ];
+        if (served)
+          parts.push(`served=${served}`);
+        if (requested)
+          parts.push(`requested=${requested}`);
+        if (fresh && fresh !== served)
+          parts.push(`fresh=${fresh}`);
+        lines.push(`${parts.join(" | ")}${reason}`);
+      }
+      break;
+    }
+  }
+  const candidates = buildRetryCandidateLine(resolution);
+  if (candidates)
+    lines.push(candidates);
+  return lines;
+}
+function buildRetryCandidateLine(resolution) {
+  if (!resolution)
+    return;
+  const parts = [];
+  if (resolution.availableVersions.length > 0) {
+    parts.push(`versions=${resolution.availableVersions.map(formatArtifact).join(",")}`);
+  }
+  if (resolution.availableRefs.length > 0) {
+    parts.push(`refs=${resolution.availableRefs.map(formatArtifact).join(",")}`);
+  }
+  return parts.length > 0 ? `queryable now: ${parts.join(" | ")}` : undefined;
+}
+function buildResolutionFromRetryCandidates(target) {
+  if (!target.availableVersions?.length && !target.availableRefs?.length) {
+    return;
+  }
+  return {
+    freshness: target.freshness,
+    indexingRef: target.indexingRef,
+    availableVersions: target.availableVersions ?? [],
+    availableRefs: target.availableRefs ?? []
+  };
+}
+function projectIdentity(identity) {
+  const out = {};
+  if (identity.kind)
+    out.kind = identity.kind;
+  if (identity.registry)
+    out.registry = identity.registry;
+  if (identity.packageName)
+    out.packageName = identity.packageName;
+  if (identity.version)
+    out.version = identity.version;
+  if (identity.repoUrl)
+    out.repoUrl = identity.repoUrl;
+  if (identity.gitRef)
+    out.gitRef = identity.gitRef;
+  if (identity.commitSha)
+    out.commitSha = identity.commitSha;
+  return out;
+}
+function projectArtifact(artifact) {
+  return artifact.version ? { version: artifact.version, ref: artifact.ref } : { ref: artifact.ref };
+}
+function formatIdentity(identity) {
+  if (!identity)
+    return;
+  if (identity.registry && identity.packageName) {
+    const version2 = identity.version ? `@${identity.version}` : "";
+    const commit = identity.commitSha ? `#${shortSha(identity.commitSha)}` : "";
+    return `${identity.registry.toLowerCase()}:${identity.packageName}${version2}${commit}`;
+  }
+  if (identity.repoUrl) {
+    const ref = identity.gitRef ? `#${identity.gitRef}` : "";
+    const commit = identity.commitSha ? `@${shortSha(identity.commitSha)}` : "";
+    return `${identity.repoUrl}${ref}${commit}`;
+  }
+  return identity.gitRef ?? identity.version ?? identity.commitSha ?? identity.kind;
+}
+function formatArtifact(artifact) {
+  return artifact.version ? `${artifact.version}@${artifact.ref}` : artifact.ref;
+}
+function identitiesDiffer(requested, fresh, served) {
+  if (!served)
+    return Boolean(requested || fresh);
+  return Boolean(requested && requested !== served || fresh && fresh !== served);
+}
+function identitiesMateriallyDiffer(left, right) {
+  if (!left || !right)
+    return Boolean(left || right);
+  return stripShortCommit(left) !== stripShortCommit(right);
+}
+function stripShortCommit(value) {
+  return value.replace(/[@#][0-9a-f]{7}$/i, "");
+}
+function shortSha(value) {
+  return /^[0-9a-f]{12,}$/i.test(value) ? value.slice(0, 7) : value;
+}
+
 // src/shared/grep-repo-response.ts
 var UTF8_ENCODER = new TextEncoder;
 function buildGrepRepoSuccessPayload(result, options) {
@@ -1102,6 +1263,9 @@ function buildGrepRepoSuccessPayload(result, options) {
   if (result.resolution) {
     envelope.resolution = projectResolution(result.resolution);
   }
+  const targetResolution = projectTargetResolution(result.targetResolution);
+  if (targetResolution)
+    envelope.targetResolution = targetResolution;
   const filter = buildFilterBlock(options);
   if (filter)
     envelope.filter = filter;
@@ -1189,8 +1353,11 @@ function buildFilterBlock(options) {
   return Object.keys(filter).length > 0 ? filter : undefined;
 }
 function formatGrepRepoTerminal(envelope, options) {
-  if (envelope.matches.length === 0) {
-    return { stdout: "" };
+  if (envelope.matches.length === 0 && !options.verbose) {
+    return {
+      stdout: "",
+      stderr: formatTerminalNotes(envelope, options.useColors)
+    };
   }
   const blocks = buildRenderBlocks(envelope.matches);
   return options.verbose ? formatVerbose(envelope, blocks, options) : formatPlain(envelope, blocks, options);
@@ -1247,6 +1414,10 @@ function formatVerbose(envelope, blocks, options) {
   }
   lines.push("");
   const blocksByFile = groupBlocksByFile(blocks);
+  if (blocksByFile.size === 0) {
+    lines.push("No matches.");
+    lines.push("");
+  }
   for (const [filePath, fileBlocks] of blocksByFile) {
     lines.push(colorize(filePath, "bold", options.useColors));
     const gutterWidth = widestLineNumberInBlocks(fileBlocks);
@@ -1418,6 +1589,9 @@ function formatTerminalNotes(envelope, useColors) {
   if (envelope.hasMore && envelope.nextCursor) {
     lines.push(dim(`More grep results available — rerun with --cursor ${shellQuote(envelope.nextCursor)}`, useColors));
   }
+  for (const note of buildTargetResolutionNotes(envelope.targetResolution)) {
+    lines.push(dim(note, useColors));
+  }
   if (lines.length === 0)
     return;
   return `${lines.join(`
@@ -1548,6 +1722,9 @@ function buildTrailer(envelope) {
   if (skipNotes.length > 0) {
     lines.push(`Note: ${skipNotes.join(", ")}.`);
   }
+  for (const note of buildTargetResolutionNotes(envelope.targetResolution)) {
+    lines.push(note);
+  }
   return lines;
 }
 function buildRenderBlocks2(matches) {
@@ -1668,6 +1845,7 @@ function renderListFilesText(envelope) {
   lines.push("");
   if (envelope.files.length === 0) {
     lines.push(envelope.hint ?? "No files match the requested filter.");
+    appendTargetResolutionNotes(lines, envelope);
     return lines.join(`
 `);
   }
@@ -1682,9 +1860,18 @@ function renderListFilesText(envelope) {
     lines.push("");
     lines.push(envelope.hint);
   }
+  appendTargetResolutionNotes(lines, envelope);
   return lines.join(`
 `);
 }
+function appendTargetResolutionNotes(lines, envelope) {
+  const notes = buildTargetResolutionNotes(envelope.targetResolution);
+  if (notes.length === 0)
+    return;
+  lines.push("");
+  for (const note of notes)
+    lines.push(note);
+}
 function buildHeader2(envelope) {
   const identity = buildIdentity(envelope);
   const countValue = envelope.hasMore ? `${envelope.files.length}+` : String(envelope.total);
@@ -2203,7 +2390,7 @@ function buildDirectVersionLookup(graph) {
     if (!fromRoot)
       continue;
     const node = graph.nodes[edge.toIndex];
-    if (!node || !node.version)
+    if (!node?.version)
       continue;
     if (!out.has(node.name)) {
       out.set(node.name, node.version);
@@ -5176,6 +5363,9 @@ function buildReadFileSuccessPayload(result, options) {
   } else if (result.content != null) {
     envelope.content = result.content;
   }
+  const targetResolution = projectTargetResolution(result.targetResolution);
+  if (targetResolution)
+    envelope.targetResolution = targetResolution;
   return envelope;
 }
 function formatReadFileTerminal(envelope, options) {
@@ -5230,10 +5420,19 @@ function formatVerboseBody(envelope, options) {
     lines.push("");
     lines.push(dim(envelope.hint, options.useColors));
   }
+  appendTargetResolutionNotes2(lines, envelope, options);
   lines.push("");
   return lines.join(`
 `);
 }
+function appendTargetResolutionNotes2(lines, envelope, options) {
+  const notes = buildTargetResolutionNotes(envelope.targetResolution);
+  if (notes.length === 0)
+    return;
+  lines.push("");
+  for (const note of notes)
+    lines.push(dim(note, options.useColors));
+}
 function splitReadFileContentLines(envelope) {
   if (!envelope.content)
     return [];
@@ -5295,6 +5494,12 @@ function renderReadFileText(envelope) {
     lines.push("");
     lines.push(`hint: ${envelope.hint}`);
   }
+  const resolutionNotes = buildTargetResolutionNotes(envelope.targetResolution);
+  if (resolutionNotes.length > 0) {
+    lines.push("");
+    for (const note of resolutionNotes)
+      lines.push(note);
+  }
   return lines.join(`
 `);
 }
@@ -6316,6 +6521,15 @@ function compactProgressTarget(target) {
     payload.indexingRef = target.indexingRef;
   if (target.requestedRefKind)
     payload.requestedRefKind = target.requestedRefKind;
+  const targetResolution = projectTargetResolution(target.targetResolution);
+  if (targetResolution)
+    payload.targetResolution = targetResolution;
+  if (target.availableVersions?.length) {
+    payload.availableVersions = target.availableVersions;
+  }
+  if (target.availableRefs?.length) {
+    payload.availableRefs = target.availableRefs;
+  }
   return Object.keys(payload).length > 0 ? payload : undefined;
 }
 function buildFilterEcho3(filters) {
@@ -6358,7 +6572,11 @@ function buildProgressFreshnessWarnings(progress) {
     requestedTarget: target.requested,
     freshTarget: target.resolvedRequested,
     servedTarget: target.served
-  })).filter((entry) => Boolean(entry));
+  })).concat((progress?.targets ?? []).map((target) => progressTargetResolutionWarning(target)).filter((entry) => Boolean(entry))).filter((entry) => Boolean(entry));
+}
+function progressTargetResolutionWarning(target) {
+  const notes = buildTargetResolutionNotes(target.targetResolution ?? buildResolutionFromRetryCandidates(target));
+  return notes.length > 0 ? notes.join(" ") : undefined;
 }
 function freshnessWarning(input) {
   if (!isTrustRelevantFreshness(input.freshness))
@@ -6377,7 +6595,7 @@ function labelsDiverge(input) {
   const served = input.servedTarget;
   if (!served)
     return false;
-  return Boolean(input.freshTarget && input.freshTarget !== served || input.requestedTarget && input.requestedTarget !== served);
+  return Boolean(input.freshTarget && input.freshTarget !== served);
 }
 function warningForEntry(entry) {
   const reasons = [];
@@ -6389,6 +6607,14 @@ function warningForEntry(entry) {
   });
   if (freshness)
     return freshness;
+  const terminalLifecycleReason = terminalLifecycleWarningReason(entry);
+  if (terminalLifecycleReason) {
+    reasons.push(terminalLifecycleReason);
+  } else {
+    const targetResolutionWarning = targetResolutionWarningForEntry(entry);
+    if (targetResolutionWarning)
+      reasons.push(targetResolutionWarning);
+  }
   if (entry.incompatibleQueryFeatures?.length) {
     reasons.push(`incompatible query features [${entry.incompatibleQueryFeatures.join(", ")}]`);
   }
@@ -6401,10 +6627,10 @@ function warningForEntry(entry) {
   if (entry.ignoredFilters?.length) {
     reasons.push(`ignored filters [${entry.ignoredFilters.join(", ")}]`);
   }
-  if (entry.indexingStatus) {
+  if (!terminalLifecycleReason && reasons.length === 0 && entry.indexingStatus) {
     reasons.push(`indexing status ${entry.indexingStatus}`);
   }
-  if (entry.codeIndexState) {
+  if (!terminalLifecycleReason && reasons.length === 0 && entry.codeIndexState) {
     if (entry.codeIndexState !== "STALE") {
       reasons.push(`code index state ${entry.codeIndexState}`);
     }
@@ -6418,6 +6644,18 @@ function warningForEntry(entry) {
   }
   return;
 }
+function terminalLifecycleWarningReason(entry) {
+  const states = Array.from(new Set([entry.indexingStatus, entry.codeIndexState].filter(Boolean)));
+  const terminalStates = states.filter((state) => state !== "INDEXING" && state !== "STALE");
+  if (terminalStates.length === 0)
+    return;
+  const status = terminalStates.join("/");
+  return entry.note ? `${entry.note} (${status})` : `status ${status}`;
+}
+function targetResolutionWarningForEntry(entry) {
+  const notes = buildTargetResolutionNotes(entry.targetResolution);
+  return notes.length > 0 ? notes.join(" ") : undefined;
+}
 function compactSourceStatus(sourceStatus) {
   if (!sourceStatus || sourceStatus.length === 0)
     return;
@@ -6447,6 +6685,13 @@ function compactSourceStatusEntry(entry) {
     payload.codeIndexState = entry.codeIndexState;
     interesting = true;
   }
+  const targetResolution = projectTargetResolution(entry.targetResolution);
+  if (targetResolution) {
+    payload.targetResolution = targetResolution;
+    if (buildTargetResolutionNotes(targetResolution).length > 0) {
+      interesting = true;
+    }
+  }
   if (entry.indexingStatus && entry.indexingStatus !== "INDEXED") {
     payload.indexingStatus = entry.indexingStatus;
     interesting = true;
@@ -6484,7 +6729,7 @@ function assertSearchFollowUpInvariant(hit) {
   if ((hit.resultType === "DOCUMENTATION_PAGE" || hit.resultType === "REPOSITORY_DOC") && !hit.locator.pageId) {
     throw new MalformedCodeNavigationResponseError(`${hit.resultType} search hit missing required pageId.`);
   }
-  if (hit.resultType === "REPOSITORY_DOC" && (!hit.locator.repoUrl || !hit.locator.gitRef || !hit.locator.filePath)) {
+  if (hit.resultType === "REPOSITORY_DOC" && (!hit.locator.repoUrl || !hit.locator.filePath)) {
     throw new MalformedCodeNavigationResponseError("REPOSITORY_DOC search hit missing repo locator fields.");
   }
 }
@@ -6496,7 +6741,7 @@ function renderUnifiedSearchSuccess(payload) {
   lines.push(buildHeader8(payload));
   lines.push("");
   if (payload.results.length === 0) {
-    lines.push(payload.completed ? "No hits." : "No hits yet - indexing.");
+    lines.push(payload.completed ? "No hits." : noHitsYetMessage(payload));
   } else {
     appendUnifiedSearchHits(lines, payload.results);
   }
@@ -6509,6 +6754,18 @@ function renderUnifiedSearchSuccess(payload) {
   return lines.join(`
 `);
 }
+function noHitsYetMessage(payload) {
+  if (payload.completed)
+    return "No hits.";
+  const status = payload.progress?.status;
+  if (status === "TIMEOUT")
+    return "No hits yet - timed out waiting.";
+  if (status === "FAILED")
+    return "No hits - search failed.";
+  if (status === "SEARCHING")
+    return "No hits yet - searching.";
+  return "No hits yet - indexing.";
+}
 function renderUnifiedSearchError(payload) {
   const lines = [];
   const header = `search${SEP6}ERROR${SEP6}code=${payload.code}${payload.retryable ? `${SEP6}retryable` : ""}`;
@@ -6638,7 +6895,9 @@ function buildTrailer2(payload) {
     lines.push(`More hits available.${nextOffsetHint}`);
   }
   if (!payload.completed && payload.searchRef) {
-    lines.push(`Indexing in progress. Call search_status with searchRef=${payload.searchRef} to follow up.`);
+    const status = payload.progress?.status;
+    const action = status === "TIMEOUT" ? "Search timed out waiting for fresh data." : status === "FAILED" ? "Search failed before completion." : status === "SEARCHING" ? "Search in progress." : "Indexing in progress.";
+    lines.push(`${action} Call search_status with searchRef=${payload.searchRef} to follow up.`);
   }
   if (payload.sourceStatus && payload.sourceStatus.length > 0) {
     lines.push("source notes:");
@@ -6669,6 +6928,9 @@ function formatProgressTarget(target) {
     parts.push(`intent=${target.requestedRefKind}`);
   if (target.indexingRef)
     parts.push(`indexingRef=${target.indexingRef}`);
+  for (const note of buildTargetResolutionNotes(target.targetResolution ?? buildResolutionFromRetryCandidates(target))) {
+    parts.push(note);
+  }
   return parts.length > 0 ? parts.join(SEP6) : "target progress unavailable";
 }
 function describeFreshness(value) {
@@ -6686,6 +6948,10 @@ function describeFreshness(value) {
   }
 }
 function formatSourceStatus(entry) {
+  const terminalReason = terminalLifecycleReason(entry);
+  if (terminalReason) {
+    return `${entry.source} (${entry.targetLabel})${SEP6}${terminalReason}`;
+  }
   const parts = [`${entry.source} (${entry.targetLabel})`];
   if (entry.indexingStatus)
     parts.push(`indexing=${entry.indexingStatus}`);
@@ -6705,8 +6971,19 @@ function formatSourceStatus(entry) {
   }
   if (entry.note)
     parts.push(entry.note);
+  for (const note of buildTargetResolutionNotes(entry.targetResolution)) {
+    parts.push(note);
+  }
   return parts.join(SEP6);
 }
+function terminalLifecycleReason(entry) {
+  const states = Array.from(new Set([entry.indexingStatus, entry.codeIndexState].filter(Boolean)));
+  const terminalStates = states.filter((state) => state !== "INDEXING" && state !== "STALE");
+  if (terminalStates.length === 0)
+    return;
+  const status = terminalStates.join("/");
+  return entry.note ? `${entry.note} (${status})` : `status ${status}`;
+}
 function quote4(value) {
   return value.includes('"') ? `'${value}'` : `"${value}"`;
 }
@@ -6769,7 +7046,7 @@ function renderUnifiedSearchStatusText(payload) {
 `);
 }
 function buildHeader9(payload) {
-  const state = payload.completed ? "complete" : "indexing";
+  const state = payload.completed ? "complete" : payload.progress?.status.toLowerCase() ?? "incomplete";
   const parts = [`search_status${SEP7}${state}`];
   if (payload.searchRef)
     parts.push(`searchRef=${payload.searchRef}`);
@@ -6797,32 +7074,10 @@ function appendResult(lines, result) {
     lines.push("");
     lines.push("source notes:");
     for (const entry of result.sourceStatus) {
-      lines.push(`  - ${formatSourceStatus2(entry)}`);
+      lines.push(`  - ${formatSourceStatus(entry)}`);
     }
   }
 }
-function formatSourceStatus2(entry) {
-  const parts = [`${entry.source} (${entry.targetLabel})`];
-  if (entry.indexingStatus)
-    parts.push(`indexing=${entry.indexingStatus}`);
-  if (entry.codeIndexState)
-    parts.push(`codeIndex=${entry.codeIndexState}`);
-  if (entry.ignoredFilters?.length) {
-    parts.push(`ignored=${entry.ignoredFilters.join(",")}`);
-  }
-  if (entry.incompatibleFilters?.length) {
-    parts.push(`incompatible=${entry.incompatibleFilters.join(",")}`);
-  }
-  if (entry.ignoredQueryFeatures?.length) {
-    parts.push(`ignoredQuery=${entry.ignoredQueryFeatures.join(",")}`);
-  }
-  if (entry.incompatibleQueryFeatures?.length) {
-    parts.push(`incompatibleQuery=${entry.incompatibleQueryFeatures.join(",")}`);
-  }
-  if (entry.note)
-    parts.push(entry.note);
-  return parts.join(SEP7);
-}
 function formatProgress(progress) {
   const next = progress.next ? `; next: ${progress.next}` : "";
   return `progress: ${progress.status}, ${progress.targetsReady}/${progress.targetsTotal} targets ready, ${progress.elapsedMs}ms elapsed${next}`;
@@ -7042,6 +7297,9 @@ function buildListFilesSuccessPayload(result, options) {
     envelope.indexedVersion = result.indexedVersion;
   if (result.resolution)
     envelope.resolution = projectResolution2(result.resolution);
+  const targetResolution = projectTargetResolution(result.targetResolution);
+  if (targetResolution)
+    envelope.targetResolution = targetResolution;
   if (result.hint)
     envelope.hint = result.hint;
   const filter = buildFilterBlock2(options);
@@ -7152,6 +7410,7 @@ function formatVerbose2(envelope, options) {
   if (envelope.resolution || envelope.indexedVersion) {
     lines.push(buildResolutionLine(envelope, options));
   }
+  appendTargetResolutionNotes3(lines, envelope, options);
   lines.push("");
   const pathWidth = longestPathLength(envelope.files);
   for (const file of envelope.files) {
@@ -7180,6 +7439,7 @@ function formatEmpty(envelope, options, verbose) {
   if (envelope.resolution || envelope.indexedVersion) {
     lines.push(buildResolutionLine(envelope, options));
   }
+  appendTargetResolutionNotes3(lines, envelope, options);
   lines.push("");
   lines.push(dim(hint, options.useColors));
   lines.push("");
@@ -7202,6 +7462,11 @@ function buildResolutionLine(envelope, options) {
     parts.push(`commit ${commit.slice(0, 7)}`);
   return dim(parts.join(" · "), options.useColors);
 }
+function appendTargetResolutionNotes3(lines, envelope, options) {
+  const notes = buildTargetResolutionNotes(envelope.targetResolution);
+  for (const note of notes)
+    lines.push(dim(note, options.useColors));
+}
 function buildIdentityLabel(envelope) {
   if (envelope.registry && envelope.name) {
     return `${envelope.name} · ${envelope.registry}`;
@@ -7251,13 +7516,10 @@ function resolveCliCodeNavTarget(spec, options) {
   const hasRepoUrl = Boolean(options.repoUrl);
   const hasGitRef = Boolean(options.gitRef);
   if (hasSpec && (hasRepoUrl || hasGitRef)) {
-    throw new InvalidPackageSpecError("Provide either a package spec (e.g. `npm:express`) or `--repo-url` + `--git-ref`, not both.");
+    throw new InvalidPackageSpecError("Provide either a package spec (e.g. `npm:express`) or `--repo-url` with optional `--git-ref`, not both.");
   }
   if (!hasSpec && !hasRepoUrl) {
-    throw new InvalidPackageSpecError("A package spec (e.g. `npm:express`) or `--repo-url` + `--git-ref` is required.");
-  }
-  if (hasRepoUrl && !hasGitRef) {
-    throw new InvalidPackageSpecError("`--repo-url` requires `--git-ref` for code files/read/grep (a tag, branch, commit, or `HEAD`).");
+    throw new InvalidPackageSpecError("A package spec (e.g. `npm:express`) or `--repo-url` is required.");
   }
   if (hasSpec) {
     const parsed = parsePackageSpec(spec);
@@ -7301,6 +7563,13 @@ function formatIndexingError(mapped) {
     const suffix = more > 0 ? ` (+${more} more)` : "";
     lines.push(`  already-indexed versions: ${shown}${suffix}`);
   }
+  const refs = detail.availableRefs;
+  if (refs && refs.length > 0) {
+    const shown = refs.slice(0, 5).map((entry) => entry.ref).join(", ");
+    const more = refs.length - 5;
+    const suffix = more > 0 ? ` (+${more} more)` : "";
+    lines.push(`  already-indexed refs: ${shown}${suffix}`);
+  }
   return lines.join(`
 `);
 }
@@ -7439,7 +7708,7 @@ function resolvePositionals(firstArg, secondArg, hasRepoUrl) {
       throw new InvalidPackageSpecError("In --repo-url mode, pass only [path-prefix] — the package spec is replaced by --repo-url.");
     }
     if (firstArg && REGISTRY_SPEC_HINT.test(firstArg)) {
-      throw new InvalidPackageSpecError(`'${firstArg}' looks like a package spec. Provide either a package spec or \`--repo-url\` + \`--git-ref\`, not both.`);
+      throw new InvalidPackageSpecError(`'${firstArg}' looks like a package spec. Provide either a package spec or \`--repo-url\` with optional \`--git-ref\`, not both.`);
     }
     return { spec: undefined, pathPrefix: firstArg };
   }
@@ -7467,7 +7736,7 @@ On an INDEXING response, the dependency is being indexed on-demand
 — retry with a longer --wait (up to 60000 ms) or pick one of the
 already-indexed versions surfaced in the error detail.`;
 function registerCodeFilesCommand(pkgCommand) {
-  return pkgCommand.command("files").summary("List files in an indexed dependency").description(PKG_FILES_DESCRIPTION).argument("[spec-or-prefix]", "Spec mode: package spec (e.g. npm:express). Repo mode (with --repo-url): the path-prefix.").argument("[path-prefix]", "Spec mode only: literal directory prefix (not a glob). 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 selector").option("--glob <glob>", "Glob selector (repeatable)", collectRepeatable).option("--ext <ext>", "Extension filter without leading dot (repeatable)", collectRepeatable).option("--file-type <type>", "File type filter such as source or doc (repeatable)", collectRepeatable).option("--language <language>", "Language filter matching aigrep language names (repeatable)", collectRepeatable).option("--file-intent <intent>", "Inclusive file-intent filter. Repeat to include multiple intents: production, test, benchmark, example, generated, fixture, build, vendor", collectRepeatable).option("--exclude-intent <intent>", "Exclude these file intents after inclusive filtering (repeatable)", collectRepeatable).option("--exclude-docs", "Skip files classified as documentation").option("--exclude-tests", "Skip files classified as tests").option("--hidden", "Include dotfiles and dot-prefixed paths").option("--limit <n>", "Max entries (1-1000, default 200)").option("--wait <ms>", `Indexing wait timeout (0-${MAX_WAIT_TIMEOUT_MS}, default ${DEFAULT_WAIT_TIMEOUT_MS})`).option("-v, --verbose", "Annotate each path with language / file-type / byte size").option("--json", "Emit the JSON envelope").action(async (arg1, arg2, options) => {
+  return pkgCommand.command("files").summary("List files in an indexed dependency").description(PKG_FILES_DESCRIPTION).argument("[spec-or-prefix]", "Spec mode: package spec (e.g. npm:express). Repo mode (with --repo-url): the path-prefix.").argument("[path-prefix]", "Spec mode only: literal directory prefix (not a glob). Ignored with --repo-url.").option("--repo-url <url>", "Repository URL addressing (defaults to the repo default branch)").option("--git-ref <ref>", "Optional tag, commit, branch, or HEAD for --repo-url.").option("--path <path>", "Exact file selector").option("--glob <glob>", "Glob selector (repeatable)", collectRepeatable).option("--ext <ext>", "Extension filter without leading dot (repeatable)", collectRepeatable).option("--file-type <type>", "File type filter such as source or doc (repeatable)", collectRepeatable).option("--language <language>", "Language filter matching aigrep language names (repeatable)", collectRepeatable).option("--file-intent <intent>", "Inclusive file-intent filter. Repeat to include multiple intents: production, test, benchmark, example, generated, fixture, build, vendor", collectRepeatable).option("--exclude-intent <intent>", "Exclude these file intents after inclusive filtering (repeatable)", collectRepeatable).option("--exclude-docs", "Skip files classified as documentation").option("--exclude-tests", "Skip files classified as tests").option("--hidden", "Include dotfiles and dot-prefixed paths").option("--limit <n>", "Max entries (1-1000, default 200)").option("--wait <ms>", `Indexing wait timeout (0-${MAX_WAIT_TIMEOUT_MS}, default ${DEFAULT_WAIT_TIMEOUT_MS})`).option("-v, --verbose", "Annotate each path with language / file-type / byte size").option("--json", "Emit the JSON envelope").action(async (arg1, arg2, options) => {
     const deps = await createContainer();
     await pkgFilesAction(arg1, arg2, options, {
       codeNavigationService: deps.codeNavigationService,
@@ -7544,7 +7813,7 @@ async function pkgGrepAction(first, second, third, options, deps) {
     if (options.json) {
       console.log(JSON.stringify(payload));
       if (payload.totalMatches === 0)
-        process.exit(1);
+        process.exitCode = 1;
       return;
     }
     const rendered = formatGrepRepoTerminal(payload, {
@@ -7557,7 +7826,7 @@ async function pkgGrepAction(first, second, third, options, deps) {
     if (rendered.stderr)
       process.stderr.write(rendered.stderr);
     if (payload.totalMatches === 0)
-      process.exit(1);
+      process.exitCode = 1;
   } catch (error2) {
     handleCodeNavCommandError(error2, options.json ?? false, formatFileErrorWithFilesHint, 2);
   }
@@ -7570,7 +7839,7 @@ function resolvePositionals2(first, second, third, hasRepoUrl) {
     return { spec: undefined, pattern: first, pathPrefix: second };
   }
   if (first !== undefined && second === undefined) {
-    throw new InvalidPackageSpecError("In spec mode, pass at least <spec> <pattern>. If you meant to target a repository instead, pass --repo-url <url> --git-ref <ref>.");
+    throw new InvalidPackageSpecError("In spec mode, pass at least <spec> <pattern>. If you meant to target a repository instead, pass --repo-url <url> with optional --git-ref <ref>.");
   }
   return { spec: first, pattern: second, pathPrefix: third };
 }
@@ -7595,7 +7864,7 @@ var PKG_GREP_DESCRIPTION = `Deterministic text grep over indexed dependency and
 ${CLI_GREP_PATTERN_NOTE}
 Use \`githits search\` for discovery; use \`githits code grep\` when you know the text or regex to match.
 
-Addressing: <spec> (registry:name[@version]) OR --repo-url <url> --git-ref <ref>.
+Addressing: <spec> (registry:name[@version]) OR --repo-url <url> [--git-ref <ref>].
 Omitted version means latest release.
 In spec mode pass <spec> <pattern> [path-prefix]; in repo-URL mode pass only <pattern> [path-prefix].
 
@@ -7610,8 +7879,8 @@ for context, --verbose for grouped output, and --cursor to continue a paginated
 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-zzmbjttb.js");
+  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 (defaults to the repo default branch)").option("--git-ref <ref>", "Optional tag, commit, branch, or HEAD for --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-2fdxv7pe.js");
     const deps = await createContainer2();
     await pkgGrepAction(arg1, arg2, arg3, options, {
       codeNavigationService: deps.codeNavigationService,
@@ -7845,7 +8114,7 @@ Binary files show a one-line sentinel instead of content. When a
 path is missing, the response is a FILE_NOT_FOUND error — use
 \`code files\` to discover available paths.`;
 function registerCodeReadCommand(pkgCommand) {
-  return pkgCommand.command("read").summary("Read a file from an indexed dependency").description(PKG_READ_DESCRIPTION).argument("[spec-or-path]", "In spec mode: package spec (e.g. npm:express). In --repo-url mode: the file path. See examples in `--help`.").argument("[path]", "File path (spec mode only — in --repo-url mode use the first positional).").option("--repo-url <url>", "Repository URL addressing (requires --git-ref)").option("--git-ref <ref>", "Tag, commit, branch, or HEAD. Required with --repo-url.").option("--lines <start-end>", "Line range (e.g. `10-40`, `10-` for open end, `-40` for open start)").option("--start <n>", "Starting line (1-indexed). Alternative to --lines.").option("--end <n>", "Ending line (inclusive). Alternative to --lines.").option("--wait <ms>", `Indexing wait timeout (0-${MAX_WAIT_TIMEOUT_MS}, default ${DEFAULT_WAIT_TIMEOUT_MS})`).option("-v, --verbose", "Render a header and a line-number gutter alongside the content").option("--json", "Emit the JSON envelope").action(async (spec, path, options) => {
+  return pkgCommand.command("read").summary("Read a file from an indexed dependency").description(PKG_READ_DESCRIPTION).argument("[spec-or-path]", "In spec mode: package spec (e.g. npm:express). In --repo-url mode: the file path. See examples in `--help`.").argument("[path]", "File path (spec mode only — in --repo-url mode use the first positional).").option("--repo-url <url>", "Repository URL addressing (defaults to the repo default branch)").option("--git-ref <ref>", "Optional tag, commit, branch, or HEAD for --repo-url.").option("--lines <start-end>", "Line range (e.g. `10-40`, `10-` for open end, `-40` for open start)").option("--start <n>", "Starting line (1-indexed). Alternative to --lines.").option("--end <n>", "Ending line (inclusive). Alternative to --lines.").option("--wait <ms>", `Indexing wait timeout (0-${MAX_WAIT_TIMEOUT_MS}, default ${DEFAULT_WAIT_TIMEOUT_MS})`).option("-v, --verbose", "Render a header and a line-number gutter alongside the content").option("--json", "Emit the JSON envelope").action(async (spec, path, options) => {
     const deps = await createContainer();
     await pkgReadAction(spec, path, options, {
       codeNavigationService: deps.codeNavigationService,
@@ -7862,7 +8131,7 @@ async function registerCodeCommandGroup(program, options = {}) {
   if (!registration.shouldRegister) {
     return;
   }
-  const codeCommand = program.command("code").summary("Source-level operations on indexed dependencies").description("List files, read files, and grep substrings inside indexed dependency source. Every command accepts either `<spec>` (registry:name[@version]) or `--repo-url <url> --git-ref <ref>`. Omitted versions use the latest release. For repo default-branch discovery without refs use `githits search`; for package-level metadata use `githits pkg`.");
+  const codeCommand = program.command("code").summary("Source-level operations on indexed dependencies").description("List files, read files, and grep substrings inside indexed dependency source. Every command accepts either `<spec>` (registry:name[@version]) or `--repo-url <url> [--git-ref <ref>]`. Omitted package versions use the latest release; omitted repo refs use the default-branch intent. For package-level metadata use `githits pkg`.");
   registerCodeFilesCommand(codeCommand);
   registerCodeReadCommand(codeCommand);
   registerCodeGrepCommand(codeCommand);
@@ -8071,7 +8340,7 @@ function registerExampleCommand(program) {
   });
 }
 async function loadContainer() {
-  const { createContainer: createContainer2 } = await import("./shared/chunk-zzmbjttb.js");
+  const { createContainer: createContainer2 } = await import("./shared/chunk-2fdxv7pe.js");
   return createContainer2();
 }
 // src/commands/feedback.ts
@@ -8363,6 +8632,10 @@ function removeServerConfig(existingContent, serversKey, serverName) {
   };
 }
 function formatSetupPreview(config) {
+  if (config.method === "composite") {
+    return config.steps.map((step) => formatSetupPreview(step)).join(`
+`);
+  }
   if (config.method === "cli") {
     return config.commands.map((cmd) => `Will run: ${cmd.command} ${cmd.args.join(" ")}`).join(`
 `);
@@ -8373,6 +8646,10 @@ function formatSetupPreview(config) {
 ${snippet}`;
 }
 function formatUninstallPreview(config) {
+  if (config.method === "composite") {
+    return config.steps.map(({ step }) => formatUninstallPreview(step)).join(`
+`);
+  }
   if (config.method === "cli") {
     return config.commands.map((cmd) => `Will run: ${cmd.command} ${cmd.args.join(" ")}`).join(`
 `);
@@ -8433,6 +8710,26 @@ async function getConfigUninstallCheckStatus(config, fs) {
     };
   }
 }
+async function isSetupAlreadyConfigured(config, fs, execService) {
+  if (config.method === "config-file") {
+    return isAlreadyConfigured(config, fs);
+  }
+  if (config.method === "cli") {
+    if (!config.checkCommand) {
+      return false;
+    }
+    return isCliAlreadyConfigured(config.checkCommand, execService);
+  }
+  for (const step of config.steps) {
+    if (!await isSetupAlreadyConfigured(step, fs, execService)) {
+      return false;
+    }
+  }
+  return true;
+}
+async function isCliAlreadyConfigured(check, execService) {
+  return await getCliCheckStatus(check, execService) === "configured";
+}
 async function getCliCheckStatus(check, execService) {
   try {
     const result = await execService.exec(check.command, check.args);
@@ -8463,6 +8760,7 @@ var ALREADY_EXISTS_PATTERNS = [
 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,
+  /(?:package\s+)?["']?pi-mcp-adapter["']?\s+(?:is\s+)?not\s+installed/i,
   /unknown\s+(?:plugin|extension|server)\s+["']?githits["']?/i,
   /marketplace\s+["']?githits-plugins["']?\s+(?:was\s+)?not\s+found/i
 ];
@@ -8563,8 +8861,7 @@ async function executeCliUninstall(uninstall, execService) {
   let anyRemoved = false;
   let anyNotConfigured = false;
   const warnings = [];
-  for (let index = 0;index < uninstall.commands.length; index += 1) {
-    const cmd = uninstall.commands[index];
+  for (const cmd of uninstall.commands) {
     const result = await executeCliUninstallCommand(cmd, execService);
     if (result.status === "failed") {
       if (anyRemoved) {
@@ -8599,6 +8896,49 @@ async function executeCliUninstall(uninstall, execService) {
   }
   return { status: "removed", message: "Removed successfully" };
 }
+async function executeCompositeUninstall(uninstall, fs, execService) {
+  let anyRemoved = false;
+  let anyNotConfigured = false;
+  const warnings = [];
+  for (const { step, failureMode } of uninstall.steps) {
+    const result = await executeUninstallStep(step, fs, execService);
+    if (result.status === "removed") {
+      anyRemoved = true;
+      warnings.push(...result.warnings ?? []);
+      continue;
+    }
+    if (result.status === "not_configured") {
+      if (anyRemoved) {
+        warnings.push(result.message);
+      } else {
+        anyNotConfigured = true;
+      }
+      continue;
+    }
+    if (failureMode === "best-effort" && anyRemoved) {
+      warnings.push(result.message);
+      continue;
+    }
+    return result;
+  }
+  if (anyRemoved) {
+    return {
+      status: "removed",
+      message: "Removed successfully",
+      warnings: warnings.length > 0 ? warnings : undefined
+    };
+  }
+  if (anyNotConfigured) {
+    return {
+      status: "not_configured",
+      message: "GitHits not configured"
+    };
+  }
+  return { status: "not_configured", message: "GitHits not configured" };
+}
+async function executeUninstallStep(step, fs, execService) {
+  return step.method === "cli" ? executeCliUninstall(step, execService) : executeConfigFileUninstall(step, fs);
+}
 async function executeConfigFileSetup(setup, fs) {
   try {
     const parentDir = fs.getDirname(setup.configPath);
@@ -8642,6 +8982,26 @@ async function executeConfigFileSetup(setup, fs) {
     };
   }
 }
+async function executeCompositeSetup(setup, fs, execService) {
+  let executedAny = false;
+  for (const step of setup.steps) {
+    if (await isSetupAlreadyConfigured(step, fs, execService)) {
+      continue;
+    }
+    executedAny = true;
+    const result = step.method === "cli" ? await executeCliSetup(step, execService) : await executeConfigFileSetup(step, fs);
+    if (result.status === "failed") {
+      return result;
+    }
+  }
+  if (!executedAny) {
+    return {
+      status: "already_configured",
+      message: "GitHits already configured"
+    };
+  }
+  return { status: "success", message: "Configured successfully" };
+}
 async function executeConfigFileUninstall(setup, fs) {
   try {
     let existingContent = "";
@@ -8728,6 +9088,25 @@ function getOpenCodeConfigDir(fs) {
   }
   return fs.joinPath(fs.getHomeDir(), ".config", "opencode");
 }
+function expandHomePath(fs, path) {
+  if (path === "~") {
+    return fs.getHomeDir();
+  }
+  if (path.startsWith("~/")) {
+    return fs.joinPath(fs.getHomeDir(), path.slice(2));
+  }
+  return path;
+}
+function getPiAgentDir(fs) {
+  const configuredDir = process.env.PI_CODING_AGENT_DIR?.trim();
+  if (configuredDir) {
+    return expandHomePath(fs, configuredDir);
+  }
+  return fs.joinPath(fs.getHomeDir(), ".pi", "agent");
+}
+function getPiMcpConfigPath(fs) {
+  return fs.joinPath(getPiAgentDir(fs), "mcp.json");
+}
 function getOpenCodeDesktopDetectPaths(fs) {
   const userDataRoot = getUserDataRoot(fs);
   return [
@@ -8746,6 +9125,57 @@ async function isExecutableAvailable(exec, executable) {
     return false;
   }
 }
+async function resolveExecutableFromPath(exec, executable) {
+  return isExecutableAvailable(exec, executable);
+}
+var PI_GLOBAL_BIN_PROBES = [
+  { command: "npm", args: ["prefix", "-g"], output: "prefix" },
+  { command: "pnpm", args: ["bin", "-g"], output: "binDir" },
+  { command: "bun", args: ["pm", "bin", "-g"], output: "binDir" }
+];
+var PI_ADAPTER_CONFIGURED_PATTERN = /(?:^|\s|:)(?:npm:)?pi-mcp-adapter(?:[\s@:]|$)/i;
+function getPiExecutableNames() {
+  return process.platform === "win32" ? ["pi.cmd", "pi.exe", "pi"] : ["pi"];
+}
+async function runGlobalBinProbe(exec, probe) {
+  try {
+    const result = await exec.exec(probe.command, [...probe.args]);
+    if (result.exitCode !== 0) {
+      return null;
+    }
+    const probePath = result.stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
+    if (!probePath) {
+      return null;
+    }
+    if (probe.output === "prefix" && process.platform !== "win32") {
+      return fsJoinPathLike(probePath, "bin");
+    }
+    return probePath;
+  } catch {
+    return null;
+  }
+}
+function fsJoinPathLike(base, child) {
+  return base.endsWith("/") ? `${base}${child}` : `${base}/${child}`;
+}
+async function detectPiExecutable(exec, fs) {
+  if (await resolveExecutableFromPath(exec, "pi")) {
+    return { command: "pi" };
+  }
+  for (const probe of PI_GLOBAL_BIN_PROBES) {
+    const binDir = await runGlobalBinProbe(exec, probe);
+    if (!binDir) {
+      continue;
+    }
+    for (const executableName of getPiExecutableNames()) {
+      const candidate = fs.joinPath(binDir, executableName);
+      if (await fs.exists(candidate)) {
+        return { command: candidate };
+      }
+    }
+  }
+  return null;
+}
 var claudeCode = {
   name: "Claude Code",
   id: "claude-code",
@@ -8885,6 +9315,76 @@ var codexCli = {
     ]
   })
 };
+var pi = {
+  name: "Pi",
+  id: "pi",
+  detectionMethod: "binary",
+  setupMethod: "composite",
+  detectCommand: detectPiExecutable,
+  getSetupConfig: (fs, context) => {
+    const piCommand = context?.command ?? "pi";
+    return {
+      method: "composite",
+      steps: [
+        {
+          method: "cli",
+          commands: [
+            {
+              command: piCommand,
+              args: ["install", "npm:pi-mcp-adapter"]
+            }
+          ],
+          checkCommand: {
+            command: piCommand,
+            args: ["list"],
+            configuredPattern: PI_ADAPTER_CONFIGURED_PATTERN
+          }
+        },
+        {
+          method: "config-file",
+          configPath: getPiMcpConfigPath(fs),
+          serversKey: "mcpServers",
+          serverName: GITHITS_SERVER_NAME,
+          serverConfig: {
+            command: GITHITS_MCP_COMMAND,
+            args: [...GITHITS_MCP_ARGS],
+            lifecycle: "eager"
+          }
+        }
+      ]
+    };
+  },
+  getUninstallConfig: (fs, context) => {
+    const piCommand = context?.command ?? "pi";
+    return {
+      method: "composite",
+      steps: [
+        {
+          failureMode: "required",
+          step: {
+            method: "config-file",
+            configPath: getPiMcpConfigPath(fs),
+            serversKey: "mcpServers",
+            serverName: GITHITS_SERVER_NAME,
+            serverConfig: {}
+          }
+        },
+        {
+          failureMode: "required",
+          step: {
+            method: "cli",
+            commands: [
+              {
+                command: piCommand,
+                args: ["remove", "npm:pi-mcp-adapter"]
+              }
+            ]
+          }
+        }
+      ]
+    };
+  }
+};
 var vscode = {
   name: "VS Code / Copilot",
   id: "vscode",
@@ -9009,6 +9509,7 @@ var agentDefinitions = [
   cline,
   claudeDesktop,
   codexCli,
+  pi,
   geminiCli,
   googleAntigravity,
   openCode
@@ -9021,7 +9522,18 @@ async function scanAgents(definitions, fs, execService) {
   };
   for (const agent of definitions) {
     let detected = false;
-    if (agent.detectionMethod === "binary" && agent.detectBinary) {
+    let setupContext;
+    if (agent.detectCommand) {
+      try {
+        const resolvedCommand = await agent.detectCommand(execService, fs);
+        if (resolvedCommand) {
+          detected = true;
+          setupContext = { command: resolvedCommand.command };
+        }
+      } catch {
+        detected = false;
+      }
+    } else if (agent.detectionMethod === "binary" && agent.detectBinary) {
       try {
         detected = await agent.detectBinary(execService);
       } catch {
@@ -9060,31 +9572,31 @@ async function scanAgents(definitions, fs, execService) {
       result.notDetected.push(agent);
       continue;
     }
-    if (agent.setupMethod === "config-file") {
-      const config = agent.getSetupConfig(fs);
-      if (config.method === "config-file" && await isAlreadyConfigured(config, fs)) {
-        result.alreadyConfigured.push(agent);
-      } else {
-        result.needsSetup.push(agent);
-      }
-    } else {
-      const config = agent.getSetupConfig(fs);
-      if (config.method === "cli" && config.checkCommand) {
+    const config = agent.getSetupConfig(fs, setupContext);
+    const scannedAgent = {
+      ...agent,
+      resolvedSetupConfig: config,
+      resolvedSetupContext: setupContext
+    };
+    if (agent.id === "gemini-cli" && config.method === "cli") {
+      if (config.checkCommand) {
         const checkStatus = await getCliCheckStatus(config.checkCommand, execService);
         let configured = checkStatus === "configured";
-        if (!configured && agent.id === "gemini-cli") {
-          if (checkStatus === "probe_failed") {
-            configured = await isGeminiExtensionInstalledFromFilesystem(fs);
-          }
+        if (!configured && checkStatus === "probe_failed") {
+          configured = await isGeminiExtensionInstalledFromFilesystem(fs);
         }
         if (configured) {
-          result.alreadyConfigured.push(agent);
+          result.alreadyConfigured.push(scannedAgent);
         } else {
-          result.needsSetup.push(agent);
+          result.needsSetup.push(scannedAgent);
         }
       } else {
-        result.needsSetup.push(agent);
+        result.needsSetup.push(scannedAgent);
       }
+    } else if (await isSetupAlreadyConfigured(config, fs, execService)) {
+      result.alreadyConfigured.push(scannedAgent);
+    } else {
+      result.needsSetup.push(scannedAgent);
     }
   }
   return result;
@@ -9094,6 +9606,20 @@ class ExitPromptError extends Error {
   name = "ExitPromptError";
 }
 // src/commands/init/init.ts
+function getResolvedSetupConfig(agent, fileSystemService) {
+  return agent.resolvedSetupConfig ?? agent.getSetupConfig(fileSystemService, agent.resolvedSetupContext);
+}
+function getPiConfigFileUninstall(agent, fileSystemService) {
+  if (agent.id !== "pi") {
+    return null;
+  }
+  const uninstallConfig = agent.getUninstallConfig?.(fileSystemService);
+  if (uninstallConfig?.method !== "composite") {
+    return null;
+  }
+  const configStep = uninstallConfig.steps.map(({ step }) => step).find((step) => step.method === "config-file");
+  return configStep ?? null;
+}
 function printReadyNextSteps() {
   console.log("  Setup complete. You're ready to use GitHits.");
   console.log();
@@ -9135,28 +9661,54 @@ async function verifyAgentUnconfigured(agent, fileSystemService, execService) {
     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) {
+async function inspectSetupForUninstall(agent, config, fileSystemService, execService) {
+  if (config.method === "config-file") {
+    const check = await getConfigUninstallCheckStatus(config, fileSystemService);
+    if (check.status === "configured")
+      return "configured";
+    if (check.status === "not_configured")
+      return "not_configured";
+    return { status: "failed", message: check.message };
+  }
+  if (config.method === "cli") {
+    if (!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: `${agent.name} does not have a verified uninstall check command.`
+      message: `Cannot inspect ${agent.name}: ${config.checkCommand.command} ${config.checkCommand.args.join(" ")} failed.`
     };
   }
-  const checkStatus = await getCliCheckStatus(config.checkCommand, execService);
-  if (checkStatus === "configured") {
-    return "configured";
-  }
-  if (checkStatus === "not_configured") {
-    return "not_configured";
+  const accumulated = {
+    configured: false,
+    notConfigured: false
+  };
+  for (const step of config.steps) {
+    const check = await inspectSetupForUninstall(agent, step, fileSystemService, execService);
+    if (check === "configured") {
+      accumulated.configured = true;
+    } else if (check === "not_configured") {
+      accumulated.notConfigured = true;
+    } else {
+      accumulated.failure = check;
+    }
   }
-  if (agent.id === "gemini-cli" && await isGeminiExtensionInstalledFromFilesystem(fileSystemService)) {
+  if (accumulated.failure)
+    return accumulated.failure;
+  if (accumulated.configured)
     return "configured";
-  }
-  return {
-    status: "failed",
-    message: `Cannot inspect ${agent.name}: ${config.checkCommand.command} ${config.checkCommand.args.join(" ")} failed.`
-  };
+  return "not_configured";
 }
 async function scanAgentsForUninstall(fileSystemService, execService) {
   const setupScan = await scanAgents(agentDefinitions, fileSystemService, execService);
@@ -9170,35 +9722,41 @@ async function scanAgentsForUninstall(fileSystemService, execService) {
     ...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);
-      }
+    const config = getResolvedSetupConfig(agent, fileSystemService);
+    const check = await inspectSetupForUninstall(agent, config, fileSystemService, execService);
+    if (check === "configured") {
+      result.configured.push(agent);
+    } else if (check === "not_configured") {
+      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
-        });
-      }
+      result.failed.push({
+        id: agent.id,
+        name: agent.name,
+        status: "failed",
+        message: check.message
+      });
+    }
+  }
+  for (const agent of setupScan.notDetected) {
+    const piConfigUninstall = getPiConfigFileUninstall(agent, fileSystemService);
+    if (!piConfigUninstall) {
+      continue;
+    }
+    const check = await getConfigUninstallCheckStatus(piConfigUninstall, fileSystemService);
+    if (check.status === "configured") {
+      result.configured.push({
+        ...agent,
+        resolvedUninstallConfig: piConfigUninstall,
+        skipUninstallVerification: true
+      });
+      result.notDetected = result.notDetected.filter((a) => a.id !== agent.id);
+    } else if (check.status === "failed") {
+      result.failed.push({
+        id: agent.id,
+        name: agent.name,
+        status: "failed",
+        message: check.message
+      });
     }
   }
   return result;
@@ -9216,7 +9774,7 @@ async function initAction(options, deps) {
     let loginResult;
     try {
       const loginDeps = await createLoginDeps();
-      loginResult = await loginFlow({}, loginDeps);
+      loginResult = loginDeps.hasValidToken ? { status: "already_authenticated", message: "Already logged in." } : await loginFlow({}, loginDeps);
     } catch (error2) {
       const msg = error2 instanceof Error ? error2.message : String(error2);
       loginResult = { status: "failed", message: msg };
@@ -9288,7 +9846,7 @@ async function initAction(options, deps) {
   for (const agent of toSetup) {
     console.log(`  Setting up ${colorize(agent.name, "bold", useColors)}...
 `);
-    const config = agent.getSetupConfig(fileSystemService);
+    const config = agent.resolvedSetupConfig ?? agent.getSetupConfig(fileSystemService);
     const preview2 = formatSetupPreview(config);
     for (const line of preview2.split(`
 `)) {
@@ -9317,7 +9875,7 @@ async function initAction(options, deps) {
         alwaysMode = true;
       }
     }
-    let result = config.method === "cli" ? await executeCliSetup(config, execService) : await executeConfigFileSetup(config, fileSystemService);
+    let result = config.method === "cli" ? await executeCliSetup(config, execService) : config.method === "config-file" ? await executeConfigFileSetup(config, fileSystemService) : await executeCompositeSetup(config, fileSystemService, execService);
     if (result.status === "success" || result.status === "already_configured") {
       const verification = await verifyAgentConfigured(agent, fileSystemService, execService);
       if (!verification.ok) {
@@ -9401,8 +9959,8 @@ async function initUninstallAction(options, deps) {
   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);
+    const setupConfig = getResolvedSetupConfig(agent, fileSystemService);
+    const uninstallConfig = agent.resolvedUninstallConfig ?? (setupConfig.method === "config-file" ? setupConfig : agent.getUninstallConfig?.(fileSystemService, agent.resolvedSetupContext));
     if (!uninstallConfig) {
       outcomes.push({
         id: agent.id,
@@ -9442,8 +10000,8 @@ async function initUninstallAction(options, deps) {
         alwaysMode = true;
       }
     }
-    let result = uninstallConfig.method === "cli" ? await executeCliUninstall(uninstallConfig, execService) : await executeConfigFileUninstall(uninstallConfig, fileSystemService);
-    if (result.status === "removed") {
+    let result = uninstallConfig.method === "cli" ? await executeCliUninstall(uninstallConfig, execService) : uninstallConfig.method === "config-file" ? await executeConfigFileUninstall(uninstallConfig, fileSystemService) : await executeCompositeUninstall(uninstallConfig, fileSystemService, execService);
+    if (result.status === "removed" && !agent.skipUninstallVerification) {
       const verification = await verifyAgentUnconfigured(agent, fileSystemService, execService);
       if (!verification.ok) {
         result = {
@@ -9523,10 +10081,11 @@ var INIT_DESCRIPTION = `Set up GitHits MCP server for your coding agents.
 
 Authenticates with your GitHits account, then scans for available agents
 (Claude Code, Cursor, Windsurf, VS Code, Cline, Claude Desktop, Codex CLI,
-Gemini CLI, Google Antigravity), checks which are already configured,
+Pi, Gemini CLI, Google Antigravity), checks which are already configured,
 and sets up unconfigured ones with your confirmation.
 
-Supports CLI-based setup (Claude Code, Codex, Gemini CLI) and config
+Supports CLI-based setup (Claude Code, Codex, Gemini CLI), Pi package setup,
+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.
@@ -9543,7 +10102,7 @@ function registerInitCommand(program) {
       fileSystemService,
       promptService,
       execService,
-      createLoginDeps: () => createAuthCommandDependencies()
+      createLoginDeps: () => createContainer()
     });
   });
   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) => {
@@ -9779,11 +10338,11 @@ var structuredCodeTargetSchema = z3.object({
   package_name: z3.string().max(255).optional().describe("Package name. Required for package scope."),
   version: z3.string().max(100).optional().describe("Package version, e.g. '4.18.2' (defaults to latest). For package scope only."),
   repo_url: z3.string().optional().describe("Repository URL (GitHub). Required for repo scope. Example: https://github.com/expressjs/express"),
-  git_ref: z3.string().optional().describe("Git ref - tag, branch, or commit. Required with repo_url for code_files/code_read/code_grep. Use HEAD for latest.")
-}).describe("Target: provide registry + package_name (package scope) or repo_url + git_ref (repo scope).");
+  git_ref: z3.string().optional().describe("Git ref - tag, branch, commit, or HEAD. Omit with repo_url to request the backend-resolved default branch.")
+}).describe("Target: provide registry + package_name (package scope) or repo_url with optional git_ref (repo scope; omitted ref means default branch intent).");
 var codeTargetSchema = z3.union([
   structuredCodeTargetSchema,
-  z3.string().min(1).describe("Compact target string. Package: `npm:react@18.2.0` or `npm:react` for latest release. Repository: `https://github.com/facebook/react#HEAD` (git ref required for code_files/code_read/code_grep).")
+  z3.string().min(1).describe("Compact target string. Package: `npm:react@18.2.0` or `npm:react` for latest release. Repository: `https://github.com/facebook/react#HEAD` or `https://github.com/facebook/react` for default branch intent.")
 ]);
 function resolveCodeTarget(target) {
   if (typeof target === "string") {
@@ -9796,10 +10355,10 @@ function resolveCodeTarget(target) {
   const hasPackageTarget = Boolean(target.registry || target.package_name);
   const hasRepoTarget = Boolean(target.repo_url || target.git_ref);
   if (hasPackageTarget && hasRepoTarget) {
-    return invalidTargetResult("Invalid target: provide either registry + package_name or repo_url + git_ref, not both.");
+    return invalidTargetResult("Invalid target: provide either registry + package_name or repo_url with optional git_ref, not both.");
   }
   if (!hasPackageTarget && !hasRepoTarget) {
-    return invalidTargetResult("Missing target: provide registry + package_name or repo_url + git_ref.");
+    return invalidTargetResult("Missing target: provide registry + package_name or repo_url.");
   }
   if (hasPackageTarget) {
     if (!target.registry || !target.package_name) {
@@ -9811,11 +10370,8 @@ function resolveCodeTarget(target) {
       version: target.version
     };
   }
-  if (!target.repo_url || !target.git_ref) {
-    if (!target.repo_url) {
-      return invalidTargetResult("Incomplete repository target: repo_url is required.");
-    }
-    return invalidTargetResult("Incomplete repository target: git_ref is required for code_files/code_read/code_grep.");
+  if (!target.repo_url) {
+    return invalidTargetResult("Incomplete repository target: repo_url is required.");
   }
   return {
     repoUrl: target.repo_url,
@@ -9861,7 +10417,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 `filePath` (or text file heading) 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`. " + "When fresh data is not ready within the wait window, responses may include `targetResolution` provenance and immediately-queryable alternatives in error details." + `
 
 ${CODE_GREP_GUARDRAIL}`;
 function createGrepRepoTool(service) {
@@ -9955,10 +10511,10 @@ var schema4 = {
   exclude_test_files: z5.boolean().optional(),
   include_hidden: z5.boolean().optional(),
   limit: z5.number().optional().describe("Max entries to return (1–1000, default 200). Out-of-range values return an `INVALID_ARGUMENT` envelope."),
-  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`."),
+  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/ref from `details.availableVersions` / `details.availableRefs`."),
   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. 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`.";
+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` + optional `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}`. " + "When fresh data is not ready within the wait window, responses may " + "include `targetResolution` provenance and immediately-queryable " + "alternatives. On an `INDEXING` error envelope, retry with a longer " + "`wait_timeout_ms` or use a version/ref from `details.availableVersions` " + "/ `details.availableRefs`.";
 function createListFilesTool(service) {
   return {
     name: "code_files",
@@ -10721,10 +11277,10 @@ var schema11 = {
   path: z12.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: z12.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: z12.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: z12.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`."),
+  wait_timeout_ms: z12.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/ref from `details.availableVersions` / `details.availableRefs`."),
   format: z12.enum(["json", "text", "text-v1"]).optional().describe('Response format. Default `text-v1` — line-numbered source content. Pass `format: "json"` for the structured envelope.')
 };
-var DESCRIPTION11 = "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." + `
+var DESCRIPTION11 = "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` + optional `target.git_ref` (repo scope), " + "mutually exclusive. When fresh data is not ready within the wait " + "window, responses may include `targetResolution` provenance and " + "immediately-queryable alternatives. On `INDEXING` retry with a " + "longer `wait_timeout_ms` or use a version/ref from error details. " + "On `NOT_FOUND` / `FILE_NOT_FOUND` call " + "`code_files` to discover the actual path." + `
 
 ${CODE_READ_GUARDRAIL}`;
 function deriveBoundedRange(startLine, endLine) {
@@ -11124,7 +11680,7 @@ var CORE_BLOCK = `GitHits provides verified, canonical code examples from global
 \`get_example\` workflow: pass \`language\` only when you know the exact name; otherwise call \`search_language\` first. Default output is markdown with a trailing \`solution_id\`. Reuse prior results before searching again. For dependency-specific grounding, prefer package-scoped \`search\` before global \`get_example\`.`;
 var PACKAGE_TOOLS_PREAMBLE = `Indexed package/source tools inspect third-party dependency source, docs, and registry metadata. Use them when a stack trace points into a dependency, you need to verify how a library works, or you're evaluating whether to add or upgrade a package.
 
-Targets: \`registry:name[@version]\` (\`registry:name\` = latest release). For \`search\`, repo URL without \`#\` uses the backend default-branch snapshot; exact \`code_*\` tools need \`#ref\` such as \`#HEAD\`. Default outputs are compact \`text-v1\`; pass \`format: "json"\` only for structured parsing.`;
+Targets: \`registry:name[@version]\` (\`registry:name\` = latest release). Repo targets can request the backend default-branch intent by omitting the ref (\`https://github.com/org/repo\` for \`search\`, or \`repo_url\` without \`git_ref\` for \`code_*\`); pass \`#HEAD\` / \`git_ref:"HEAD"\` when you specifically need latest HEAD. Default outputs are compact \`text-v1\`; pass \`format: "json"\` only for structured parsing.`;
 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.";
@@ -11948,7 +12504,7 @@ function requireSearchService(deps) {
   return deps.codeNavigationService;
 }
 async function loadContainer2() {
-  const { createContainer: createContainer2 } = await import("./shared/chunk-zzmbjttb.js");
+  const { createContainer: createContainer2 } = await import("./shared/chunk-2fdxv7pe.js");
   return createContainer2();
 }
 function parseTargetSpecs(specs) {
@@ -12047,7 +12603,7 @@ function formatUnifiedSearchTerminal(payload) {
     lines.push("");
     lines.push("Partial results:");
   }
-  const sourceStatusNotes = formatSourceStatusNotes(payload.sourceStatus);
+  const sourceStatusNotes = formatSourceStatusNotes(payload.sourceStatus, warnings);
   if (payload.results.length === 0) {
     lines.push("No results.");
     if (sourceStatusNotes.length > 0) {
@@ -12159,13 +12715,17 @@ function formatSearchStatusPartialTerminal(payload) {
     sourceStatus: payload.result.sourceStatus
   });
 }
-function formatSourceStatusNotes(sourceStatus) {
+function formatSourceStatusNotes(sourceStatus, warnings) {
   const useColors = shouldUseColors();
   if (!sourceStatus) {
     return [];
   }
   const lines = [];
   for (const entry of sourceStatus) {
+    const warningPrefix = `Source '${entry.source.toLowerCase()}' for ${entry.targetLabel}:`;
+    if (warnings?.some((warning2) => warning2.startsWith(warningPrefix))) {
+      continue;
+    }
     const label = `${entry.source.toLowerCase()} on ${entry.targetLabel}`;
     if (entry.ignoredFilters && entry.ignoredFilters.length > 0) {
       lines.push(dim(`Note: ${label} ignored filters: ${entry.ignoredFilters.join(", ")}`, useColors));
@@ -12396,7 +12956,7 @@ function mergeRanges2(ranges) {
   }
   return merged;
 }
-function formatUnifiedSearchMetadata(entry, useColors) {
+function formatUnifiedSearchMetadata(entry, _useColors) {
   if (entry.type !== "documentation_page" && entry.type !== "repository_doc") {
     return [];
   }