@mrdrmccoy/xerj-opencode-plugin 0.4.5 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrdrmccoy/xerj-opencode-plugin",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "XERJ integration for OpenCode: local code and docs search, agent memory, and retrieval accounting.",
   "repository": {
     "type": "git",

package/src/hooks/session.ts

@@ -155,6 +155,7 @@ async function retrieve(
 
   try {
     return await search.search(text, {
+      surface: "context",
       k: options.config.context.maxPassages,
       maxTokens: options.config.context.maxTokens,
       signal: controller.signal,

package/src/index/watcher.ts

@@ -50,6 +50,10 @@ const STDERR_TAIL_LINES = 20;
 // The engine refuses a second watcher for the same journal and says so.
 const CONTENTION_MARKER = "already owns";
 const CONTENTION_RETRY_MS = 5_000;
+// A watcher that survives this long is watching, even before its first run
+// document lands: an initial pass over a large corpus takes minutes, and the
+// status would otherwise read "starting" the whole time.
+const WATCH_SETTLE_MS = 3_000;
 
 export class CorpusService {
   readonly layout: CorpusLayout;
@@ -66,6 +70,7 @@ export class CorpusService {
   private stopped = false;
   private spawning = false;
   private lastStderr = "";
+  private spawnedAt = 0;
 
   constructor(private readonly options: CorpusServiceOptions) {
     this.layout = corpusLayout(options.projectRoot, options.prefix, options.dataRoot);
@@ -128,8 +133,13 @@ export class CorpusService {
   }
 
   snapshot(): CorpusSnapshot {
+    const settled =
+      this.state === "starting" &&
+      this.child !== null &&
+      Date.now() - this.spawnedAt >= WATCH_SETTLE_MS;
+
     return {
-      state: this.state,
+      state: settled ? "watching" : this.state,
       lastRun: this.lastRun,
       restarts: this.restarts,
       runs: this.runs,
@@ -165,6 +175,7 @@ export class CorpusService {
     this.child = child;
     this.spawning = false;
     this.lastStderr = "";
+    this.spawnedAt = Date.now();
     if (watch) this.state = "starting";
 
     this.attachOutput(child);

package/src/search/rank.ts

@@ -59,3 +59,23 @@ export function demoteGenerated(
     })
     .sort((left, right) => right.score - left.score);
 }
+
+/**
+ * Drops generated files the query does not name. Injection shares one small
+ * budget across a whole turn, and a lockfile passage matches on dependency
+ * names that have nothing to do with the question, so it can crowd out the
+ * source that answers it. Tool searches keep them: the caller asked directly.
+ */
+export function dropGenerated(
+  hits: ReadonlyArray<ParsedHit>,
+  query: string,
+): ParsedHit[] {
+  const named = query.toLowerCase();
+
+  return hits.filter((hit) => {
+    if (hit.path === null) return true;
+    if (!isGeneratedPath(hit.path)) return true;
+    const basename = hit.path.toLowerCase().split("/").pop() ?? "";
+    return named.includes(basename);
+  });
+}

package/src/search/service.ts

@@ -14,7 +14,7 @@ import type { Logger } from "../log.ts";
 import { XerjClient } from "../node/client.ts";
 import type { BrainSpec } from "../paths.ts";
 import type { BrainGraph } from "./brains.ts";
-import { demoteGenerated } from "./rank.ts";
+import { demoteGenerated, dropGenerated } from "./rank.ts";
 
 export interface SearchHit {
   readonly index: string;
@@ -36,7 +36,14 @@ export interface SearchResult {
   readonly narrowingBytes: number;
 }
 
+/**
+ * Where the results go. Injection shares a small budget across a whole turn,
+ * so it is stricter than an explicit tool call about generated files.
+ */
+export type SearchSurface = "context" | "tool";
+
 export interface SearchOptions {
+  readonly surface?: SearchSurface;
   readonly k?: number;
   readonly maxTokens?: number;
   readonly signal?: AbortSignal;
@@ -132,7 +139,8 @@ export class SearchService {
 
     const strategy = semantic ? "hybrid" : "lexical";
     const fused = semantic ? fuse([lexical.hits, semantic.hits], k) : lexical.hits.slice(0, k);
-    const located = demoteGenerated(this.locateBrainPaths(fused), trimmed);
+    const ranked = demoteGenerated(this.locateBrainPaths(fused), trimmed);
+    const located = options.surface === "context" ? dropGenerated(ranked, trimmed) : ranked;
     const resolved = await this.resolveLines(located, trimmed);
     const hits = dropShadowedWholeFiles(
       resolved,