pi-ast-sgrep 2.2.1 → 2.5.2

package/dist/host/tools.d.ts

@@ -13,7 +13,7 @@ export declare const DEFAULT_LIMIT = 8;
  * session, or a host that drops the built-ins still gets them — but they are
  * left out of the active set when the host already provides read+edit. Pi only
  * sends ACTIVE tools (schema, snippet, guidelines) to the model, so this is the
- * difference between ~296 tokens per request and nothing.
+ * difference between ~271 tokens per request and nothing.
  *
  * ASGREP_KEEP_FILE_TOOLS=1 pins them active regardless.
  */

package/dist/host/tools.js

@@ -4,22 +4,21 @@ import { Type } from "typebox";
 import { createAsgrepConnector, runCodemode, runNativeBatch, runBatchViaStdin, CODEMODE_TYPES_FOR_MODEL, NativeSessionPool, argvFor, asEnvelope, applyQueryScope, warmCodemodeSandbox, resetCodemodeSandboxForTests, isClosedWorkerError, } from "../codemode/index.js";
 import { AstSgrepRuntime, FreshnessCoordinator, RuntimeError } from "../runtime/runtime.js";
 import { RESOLVED_ROOT } from "../runtime/types.js";
-import { ASGREP_PROMPT_GUIDELINES, ASGREP_PROMPT_SNIPPET, formatCodemodeResult, } from "../ui/present.js";
+import { ASGREP_PROMPT_GUIDELINES, ASGREP_PROMPT_GUIDELINES_HOST_FILES, ASGREP_PROMPT_SNIPPET, formatCodemodeResult, } from "../ui/present.js";
 import { EMPTY_CALL, renderAsgrepResult } from "../ui/card.js";
 import { bounded, errorDetails, failure, isFreshnessTimeout, extractInPath, report, success, } from "./results.js";
 export const DEFAULT_LIMIT = 8;
 const MAX_LIMIT = 100;
 const MAX_EXCERPT_LINES = 100;
 const searchParameters = Type.Object({
-    query: Type.String({ maxLength: 4_096, description: "Query, symbol, or pattern" }),
+    query: Type.String({ maxLength: 4_096 }),
     mode: Type.Optional(Type.Unsafe({
         type: "string",
         enum: ["natural", "pattern", "defs", "callers", "chain", "semantic", "word", "literal", "regex", "imports"],
         default: "natural",
-        description: "Search strategy",
     })),
     limit: Type.Optional(Type.Integer({ default: DEFAULT_LIMIT })),
-    excerptLines: Type.Optional(Type.Integer({ default: 0, description: "Inline N excerpt lines per hit" })),
+    excerptLines: Type.Optional(Type.Integer({ default: 0 })),
     in: Type.Optional(Type.String({ maxLength: 512, description: "Bound to a directory or glob" })),
     lang: Type.Optional(Type.String({ maxLength: 32, description: "Language filter (rs, ts, py)" })),
 }, { additionalProperties: false });
@@ -27,9 +26,9 @@ const indexParameters = Type.Object({
     force: Type.Optional(Type.Boolean({ default: false, description: "Rebuild the index from scratch" })),
 }, { additionalProperties: false });
 const editParameters = Type.Object({
-    path: Type.Optional(Type.String({ maxLength: 512, description: "File to edit" })),
+    path: Type.Optional(Type.String({ maxLength: 512 })),
     oldText: Type.Optional(Type.String({ description: "Exact text to replace (must match once)" })),
-    newText: Type.Optional(Type.String({ description: "Replacement" })),
+    newText: Type.Optional(Type.String()),
     edits: Type.Optional(Type.Array(Type.Object({
         path: Type.Optional(Type.String({ minLength: 1, maxLength: 512 })),
         oldText: Type.String({ minLength: 1 }),
@@ -37,7 +36,7 @@ const editParameters = Type.Object({
     }), { maxItems: 64, description: "Multi-edit entries; top-level path is the default" })),
 }, { additionalProperties: false });
 const readParameters = Type.Object({
-    path: Type.Optional(Type.String({ maxLength: 512, description: "File to read" })),
+    path: Type.Optional(Type.String({ maxLength: 512 })),
     ref: Type.Optional(Type.String({ description: "Hit ref path#L12-L40" })),
     refs: Type.Optional(Type.Array(Type.String(), { maxItems: 24, description: "Several refs in one call" })),
     start: Type.Optional(Type.Integer()),
@@ -49,7 +48,7 @@ const codemodeParameters = Type.Object({
     code: Type.String({
         minLength: 1,
         maxLength: 32_000,
-        description: "JavaScript: async () => { ... } or a bare body with return. The returned value is the tool result.",
+        description: "JavaScript: async () => { ... } or a bare body with return.",
     }),
     timeoutMs: Type.Optional(Type.Integer({ description: "Timeout ms (default 30000)" })),
 }, { additionalProperties: false });
@@ -84,7 +83,7 @@ function withSearchLang(argv, lang) {
  * session, or a host that drops the built-ins still gets them — but they are
  * left out of the active set when the host already provides read+edit. Pi only
  * sends ACTIVE tools (schema, snippet, guidelines) to the model, so this is the
- * difference between ~296 tokens per request and nothing.
+ * difference between ~271 tokens per request and nothing.
  *
  * ASGREP_KEEP_FILE_TOOLS=1 pins them active regardless.
  */
@@ -518,10 +517,10 @@ export function registerAstSgrepTools(pi, runtime = new AstSgrepRuntime(pi), fre
         name: "asgrep",
         label: "asgrep",
         promptSnippet: ASGREP_PROMPT_SNIPPET,
-        promptGuidelines: [...ASGREP_PROMPT_GUIDELINES],
+        promptGuidelines: [...(hostProvidesFileTools(pi) ? ASGREP_PROMPT_GUIDELINES_HOST_FILES : ASGREP_PROMPT_GUIDELINES)],
         description: [
-            "Code search (in-process, warm Searcher): use it for any code lookup instead of grep.",
-            "Write JavaScript; the returned value is your result.",
+            "Code search: use it for any code lookup instead of grep.",
+            "The returned value is your result.",
             CODEMODE_TYPES_FOR_MODEL,
             "Example: async () => (await asgrep.search(\"auth\", { limit: 5 })).hits",
         ].join("\n"),
@@ -608,7 +607,7 @@ export function registerAstSgrepTools(pi, runtime = new AstSgrepRuntime(pi), fre
     pi.registerTool({
         name: "asgrep_search",
         label: "asgrep search",
-        promptSnippet: "One-shot asgrep search",
+        promptSnippet: "One-shot search",
         description: "One-shot search. Use asgrep (Code Mode) for anything multi-step, parallel, or filtered.",
         parameters: searchParameters,
         renderShell: "self",
@@ -675,7 +674,7 @@ export function registerAstSgrepTools(pi, runtime = new AstSgrepRuntime(pi), fre
         name: "asgrep_edit",
         label: "asgrep edit",
         promptSnippet: "Exact-string edit",
-        description: "Edit by exact-string replace; oldText must match once. edits[] applies many atomically.",
+        description: "Edit by exact-string replace. edits[] applies many atomically.",
         parameters: editParameters,
         renderShell: "self",
         renderCall() {
@@ -735,7 +734,7 @@ export function registerAstSgrepTools(pi, runtime = new AstSgrepRuntime(pi), fre
         name: "asgrep_index",
         label: "asgrep index",
         promptSnippet: "Build or rebuild the index",
-        description: "Build or rebuild the index (embeddings included).",
+        description: "Build or rebuild the index.",
         parameters: indexParameters,
         renderShell: "self",
         renderCall() {

package/dist/ui/present.d.ts

@@ -27,8 +27,16 @@ export type EnvelopeLike = {
     backend?: unknown;
     [key: string]: unknown;
 };
-export declare const ASGREP_PROMPT_SNIPPET = "Code search by intent, symbol, defs, callers, pattern (asgrep; use without being asked)";
+export declare const ASGREP_PROMPT_SNIPPET = "Code search by intent, symbol, defs, callers, pattern (use without being asked)";
 export declare const ASGREP_PROMPT_GUIDELINES: readonly ["Any code lookup: call asgrep first; read code with asgrep_read, change it with asgrep_edit.", "Compose in Code Mode (search/defs/read, Promise.all, small shaped value); grep only exact strings/filenames. Bound with in:\"path\"; on 0 hits use suggested_next."];
+/**
+ * Guideline variant for hosts that already ship read/edit built in: our
+ * one-shot file tools are inactive there, so naming them would point the
+ * model at tools it cannot see. The host's own builtins describe
+ * themselves; this keeps only the asgrep-first routing plus the shared
+ * composition guideline.
+ */
+export declare const ASGREP_PROMPT_GUIDELINES_HOST_FILES: readonly ["Any code lookup: call asgrep first.", "Compose in Code Mode (search/defs/read, Promise.all, small shaped value); grep only exact strings/filenames. Bound with in:\"path\"; on 0 hits use suggested_next."];
 export declare function paint(theme: PresentTheme | undefined, role: string, text: string, bold?: boolean): string;
 export declare function hitLocation(hit: HitLike): string;
 export declare function hitLabel(hit: HitLike): string;

package/dist/ui/present.js

@@ -1,9 +1,20 @@
 /** Neat asgrep tool chrome for the Pi TUI and the model-visible content. */
-export const ASGREP_PROMPT_SNIPPET = "Code search by intent, symbol, defs, callers, pattern (asgrep; use without being asked)";
+export const ASGREP_PROMPT_SNIPPET = "Code search by intent, symbol, defs, callers, pattern (use without being asked)";
 export const ASGREP_PROMPT_GUIDELINES = [
     "Any code lookup: call asgrep first; read code with asgrep_read, change it with asgrep_edit.",
     "Compose in Code Mode (search/defs/read, Promise.all, small shaped value); grep only exact strings/filenames. Bound with in:\"path\"; on 0 hits use suggested_next.",
 ];
+/**
+ * Guideline variant for hosts that already ship read/edit built in: our
+ * one-shot file tools are inactive there, so naming them would point the
+ * model at tools it cannot see. The host's own builtins describe
+ * themselves; this keeps only the asgrep-first routing plus the shared
+ * composition guideline.
+ */
+export const ASGREP_PROMPT_GUIDELINES_HOST_FILES = [
+    "Any code lookup: call asgrep first.",
+    ASGREP_PROMPT_GUIDELINES[1],
+];
 export function paint(theme, role, text, bold = false) {
     const body = bold && theme ? theme.bold(text) : text;
     return theme ? theme.fg(role, body) : body;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ast-sgrep",
-  "version": "2.2.1",
+  "version": "2.5.2",
   "description": "Native Code Mode, structural, graph, and semantic code search for Pi",
   "type": "module",
   "license": "MIT",