omp-fabric 1.25.7 → 1.25.9

package/dist/fabric-runtime-state.js

@@ -11,8 +11,8 @@ import {
   MemoryProvider,
   actionArgNormalizer,
   uniqueDeclaredKeyForSpelling
-} from "./chunks/chunk-REHGQCXU.js";
-import "./chunks/chunk-63VIZJGS.js";
+} from "./chunks/chunk-J2BDKPO4.js";
+import "./chunks/chunk-BWLZ6VDQ.js";
 import "./chunks/chunk-U5FYOMG5.js";
 import {
   ApprovalController,
@@ -33,7 +33,7 @@ import {
   repairFabricGuestCode,
   resolveFabricIdentity,
   runFabricHandoffAtBoundary
-} from "./chunks/chunk-XLINRLLP.js";
+} from "./chunks/chunk-PIW2DEO2.js";
 import "./chunks/chunk-7VIQNUPS.js";
 import {
   AgentTranscriptReader,
@@ -50,7 +50,7 @@ import {
   repairActionName,
   setActiveCompiledSurface,
   setActiveRepairCompiler
-} from "./chunks/chunk-3KORI7FQ.js";
+} from "./chunks/chunk-KLWNXXEI.js";
 import {
   formatFabricEffectConflict
 } from "./chunks/chunk-LMAVZN7J.js";
@@ -63,8 +63,8 @@ import {
   withExclusiveFileLockAsync
 } from "./chunks/chunk-YWEXP724.js";
 import "./chunks/chunk-4A4MVZQW.js";
-import "./chunks/chunk-GPJV2FSP.js";
-import "./chunks/chunk-G3ELO3QC.js";
+import "./chunks/chunk-WX6C7N3W.js";
+import "./chunks/chunk-Z6TTRT6Q.js";
 import {
   FABRIC_COMPONENT_DISCOVER_EVENT,
   FABRIC_PROVIDER_DISCOVER_EVENT,
@@ -94,7 +94,7 @@ import {
   resolveAgentCwd,
   resolveOmpBinary,
   validateAgentCwdRequest
-} from "./chunks/chunk-ABBGHQVX.js";
+} from "./chunks/chunk-YAI5SCIE.js";
 import "./chunks/chunk-VPPIJRNZ.js";
 import {
   executeFile,
@@ -104,7 +104,7 @@ import {
 import "./chunks/chunk-CT2AJ2UI.js";
 import {
   checkedHandoffCompaction
-} from "./chunks/chunk-H3KRHDDF.js";
+} from "./chunks/chunk-QJKOPPW2.js";
 import {
   DEFAULT_FABRIC_CONFIG,
   FUZZY_RESOLUTION_MARKERS,
@@ -154,7 +154,7 @@ import {
 import {
   estimateTokens,
   fabricExecTitleHintCached
-} from "./chunks/chunk-BQG4LFAC.js";
+} from "./chunks/chunk-D55BFSFK.js";
 import "./chunks/chunk-3J7BKUNG.js";
 import {
   MAX_COMPACTION_INSTRUCTIONS_CHARS,
@@ -164,12 +164,12 @@ import {
   encodeCompactionRequest
 } from "./chunks/chunk-QSRTEINF.js";
 import "./chunks/chunk-UAP6IQIR.js";
-import "./chunks/chunk-3BS4RMF4.js";
+import "./chunks/chunk-AZBJNZS4.js";
 import {
   FabricExecutionTraceRecorder,
   FabricTraceSafeError,
   executionOutcomeFromError
-} from "./chunks/chunk-JBKYNJFN.js";
+} from "./chunks/chunk-FL4A542C.js";
 import {
   OMP_GUEST_TOOL_NAMES,
   OMP_GUEST_TOOL_NAME_SET,
@@ -10773,6 +10773,10 @@ var GREP_SKIP_PROPERTY = {
   type: "number",
   description: "Files to skip before collecting results \u2014 paginate when a search hit the file limit"
 };
+var GREP_LIMIT_PROPERTY = {
+  type: "number",
+  description: "Cap on total surfaced matches \u2014 applied on top of the per-file and file-window caps, never above them"
+};
 var GITIGNORE_PROPERTY = {
   type: "boolean",
   description: "Respect gitignore rules; pass false to search ignored files such as build output or .env"
@@ -10793,7 +10797,7 @@ var withExtraProperties = (document, extras) => {
   if (Object.keys(additions).length === 0) return document;
   return { ...schema, properties: { ...properties, ...additions } };
 };
-var withGrepSkipSchema = (document) => withExtraProperties(document, { skip: GREP_SKIP_PROPERTY, gitignore: GITIGNORE_PROPERTY });
+var withGrepOptionSchema = (document) => withExtraProperties(document, { skip: GREP_SKIP_PROPERTY, limit: GREP_LIMIT_PROPERTY, gitignore: GITIGNORE_PROPERTY });
 var withFindFilterSchema = (document) => withExtraProperties(document, { gitignore: GITIGNORE_PROPERTY, hidden: HIDDEN_PROPERTY });
 var grepSession = (cwd, context) => ({
   cwd,
@@ -10804,12 +10808,12 @@ var grepSession = (cwd, context) => ({
     context === void 0 ? void 0 : { "grep.contextBefore": Math.max(0, Math.floor(context)), "grep.contextAfter": Math.max(0, Math.floor(context)) }
   )
 });
-var createGrepDefinitionWithSkip = (cwd) => {
+var createGrepDefinitionWithOptions = (cwd) => {
   const legacy = createGrepToolDefinition(cwd);
   const defaultTool = new GrepTool(grepSession(cwd));
   return {
     ...legacy,
-    parameters: withGrepSkipSchema(legacy.parameters),
+    parameters: withGrepOptionSchema(legacy.parameters),
     execute: (toolCallId, params, signal, onUpdate, context) => {
       const record2 = asRecord(params) ?? {};
       const rawPattern = typeof record2.pattern === "string" ? record2.pattern : "";
@@ -10817,7 +10821,8 @@ var createGrepDefinitionWithSkip = (cwd) => {
       const glob = typeof record2.glob === "string" ? record2.glob : void 0;
       const contextLines = typeof record2.context === "number" ? record2.context : void 0;
       const skip = typeof record2.skip === "number" ? record2.skip : void 0;
-      const tool = contextLines === void 0 ? defaultTool : new GrepTool(grepSession(cwd, contextLines));
+      const limit = typeof record2.limit === "number" ? record2.limit : void 0;
+      const tool = contextLines === void 0 && limit === void 0 ? defaultTool : new GrepTool(grepSession(cwd, contextLines), limit === void 0 ? void 0 : { totalMatchLimit: limit });
       return tool.execute(
         toolCallId,
         {
@@ -10977,6 +10982,7 @@ var readTruncationMeta = (details) => {
 };
 var UNREADABLE_READ_NOTE = /^\[Cannot read (?:binary file '|\.[^\s:]+ file: )/;
 var REPEAT_READ_HINT_PATTERN = /\n\n\[You have received this identical output \d+ times\. Re-reading '[\s\S]*?' will not change it — use a narrower selector \(path:A-B\), or proceed with the edit\.\]$/;
+var stripGrepPageCursor = (text) => text.replace(/\n*Showing files \d+-\d+ of [^\n]*\. Use skip=\d+ for the next page, or narrow paths\/pattern\.\n?/, "\n");
 var stripRepeatReadHint = (text) => text.endsWith("]") ? text.replace(REPEAT_READ_HINT_PATTERN, "") : text;
 var dropLeadingLines = (text, count) => {
   if (count <= 0) return text;
@@ -11036,8 +11042,19 @@ var unreadableReadMessage = (note, readPath) => {
   const remedy = target ? ` Read the bytes with omp.read("${target}:raw").` : "";
   return `omp.read returned no text content: ${note.trim()}${remedy}`;
 };
-var restoreBashOutput = (artifactPath, maxChars, delivered, artifactElidedBytes) => {
+var artifactFailureClause = (artifactError) => typeof artifactError === "string" ? `the host failed to save it (artifact ${artifactError} failed)` : "the host failed to save it";
+var oversizedArtifactBytes = (artifactPath, maxChars) => {
   if (!artifactPath || maxChars <= 0) return void 0;
+  try {
+    const { size } = statSync4(artifactPath);
+    return size > maxChars ? size : void 0;
+  } catch {
+    return void 0;
+  }
+};
+var restoreBashOutput = (artifactPath, maxChars, delivered, artifactElidedBytes, artifactError) => {
+  if (!artifactPath || maxChars <= 0) return void 0;
+  if (artifactError !== void 0) return void 0;
   if (artifactElidedBytes !== void 0 && artifactElidedBytes > 0) return void 0;
   let size;
   try {
@@ -11067,15 +11084,24 @@ var withoutColumnLimit = (detailRecord, metaRecord) => {
   const { meta: _meta, ...remainingDetails } = detailRecord;
   return remainingDetails;
 };
-var grepTruncationSignal = (details) => {
+var grepTruncationSignal = (details, requestedLimit) => {
   const record2 = asRecord(details);
   if (!record2 || record2.truncated !== true) return void 0;
-  const perFile = finiteNumber2(record2.perFileLimitReached);
+  const reached = finiteNumber2(record2.perFileLimitReached);
+  const askedFor = requestedLimit === void 0 ? void 0 : Math.max(1, Math.floor(requestedLimit));
+  const totalLimit = reached !== void 0 && reached === askedFor ? reached : void 0;
+  const perFile = totalLimit === void 0 ? reached : void 0;
   const maxColumn = finiteNumber2(asRecord(asRecord(asRecord(record2.meta)?.limits)?.columnTruncated)?.maxColumn);
   const fileCount = finiteNumber2(record2.fileCount);
   const reasons = [];
   const notes = [];
   let continuation = null;
+  if (totalLimit !== void 0) {
+    reasons.push("matchLimit");
+    notes.push(
+      `Only the first ${totalLimit} matches are returned because limit=${totalLimit}; raise limit or narrow the pattern.`
+    );
+  }
   if (perFile !== void 0) {
     reasons.push("matchLimit");
     notes.push(
@@ -11101,6 +11127,7 @@ var grepTruncationSignal = (details) => {
     reasons,
     ...finiteNumber2(record2.matchCount) === void 0 ? {} : { matchCount: record2.matchCount },
     ...fileCount === void 0 ? {} : { fileCount },
+    ...totalLimit === void 0 ? {} : { matchLimit: totalLimit },
     ...perFile === void 0 ? {} : { perFileMatchLimit: perFile },
     ...maxColumn === void 0 ? {} : { maxColumn },
     continue: continuation,
@@ -11205,8 +11232,10 @@ var normalizeResult = (name, result, artifactPaths, appendReadNewline = true, ex
     return readSignal?.signal ? appendTruncationMarker(body, readSignal.signal) : body;
   }
   if (name === "grep") {
-    const signal = grepTruncationSignal(result.details);
-    return signal ? appendTruncationMarker(text, signal) : text;
+    const signal = grepTruncationSignal(result.details, extras?.grepLimit);
+    if (!signal) return text;
+    const body = signal.matchLimit === void 0 ? text : stripGrepPageCursor(text);
+    return appendTruncationMarker(body, signal);
   }
   if (name === "find") {
     const signal = findTruncationSignal(result.details);
@@ -11226,7 +11255,8 @@ var normalizeResult = (name, result, artifactPaths, appendReadNewline = true, ex
     if (truncation && typeof truncation === "object" && !Array.isArray(truncation)) {
       const truncationRecord = truncation;
       const artifactId = truncationRecord.artifactId;
-      const fullOutputPath = typeof artifactId === "string" ? artifactPaths?.get(artifactId) ?? extras?.bashArtifactPath : extras?.bashArtifactPath;
+      const artifactError = metaRecord?.artifactError;
+      const fullOutputPath = artifactError !== void 0 ? void 0 : typeof artifactId === "string" ? artifactPaths?.get(artifactId) ?? extras?.bashArtifactPath : extras?.bashArtifactPath;
       const artifactElidedBytes = finiteNumber2(truncationRecord.artifactElidedBytes);
       details = {
         ...detailRecord,
@@ -11246,7 +11276,7 @@ var normalizeResult = (name, result, artifactPaths, appendReadNewline = true, ex
           ...columnCap === void 0 ? {} : { maxColumn: columnCap },
           fullOutputPath: fullOutputPath ?? null,
           continue: null,
-          note: fullOutputPath ? artifactElidedBytes === void 0 ? `Output exceeded the host bash result budget; the complete stream is on disk at ${fullOutputPath}.` : `Output exceeded the host bash result budget, and the on-disk artifact at ${fullOutputPath} is itself capped: ${artifactElidedBytes} bytes were dropped from its middle. Only the artifact's head and tail survive; set the host's \`tools.artifactMaxBytes\` to \`0\` for an uncapped file.` : "Output exceeded the host bash result budget and no full-output artifact was retained."
+          note: artifactError !== void 0 ? `Output exceeded the host bash result budget and ${artifactFailureClause(artifactError)}, so the full output is unrecoverable.` : fullOutputPath ? artifactElidedBytes === void 0 ? `Output exceeded the host bash result budget; the complete stream is on disk at ${fullOutputPath}.` : `Output exceeded the host bash result budget, and the on-disk artifact at ${fullOutputPath} is itself capped: ${artifactElidedBytes} bytes were dropped from its middle. Only the artifact's head and tail survive; set the host's \`tools.artifactMaxBytes\` to \`0\` for an uncapped file.` : "Output exceeded the host bash result budget and no full-output artifact was retained."
         });
       }
     } else {
@@ -11255,26 +11285,31 @@ var normalizeResult = (name, result, artifactPaths, appendReadNewline = true, ex
         const columnElidedBytes = finiteNumber2(
           asRecord(asRecord(metaRecord?.limits)?.columnTruncated)?.artifactElidedBytes
         );
+        const artifactError = metaRecord?.artifactError;
+        const maxChars = extras?.maxResultChars ?? 0;
         const restored = restoreBashOutput(
           extras?.bashArtifactPath,
-          extras?.maxResultChars ?? 0,
+          maxChars,
           text,
-          columnElidedBytes
+          columnElidedBytes,
+          artifactError
         );
         if (restored === void 0) {
+          const fullOutputPath = artifactError === void 0 ? extras?.bashArtifactPath : void 0;
+          const oversizedBytes = columnElidedBytes === void 0 ? oversizedArtifactBytes(fullOutputPath, maxChars) : void 0;
           details = {
             ...detailRecord,
             columnTruncated: { maxColumn: columnCap, restored: false },
-            ...extras?.bashArtifactPath ? { fullOutputPath: extras.bashArtifactPath } : {}
+            ...fullOutputPath ? { fullOutputPath } : {}
           };
           output = appendTruncationMarker(text, {
             tool: name,
             partial: true,
             reasons: ["columnLimit"],
             maxColumn: columnCap,
-            fullOutputPath: extras?.bashArtifactPath ?? null,
+            fullOutputPath: fullOutputPath ?? null,
             continue: null,
-            note: columnElidedBytes !== void 0 && columnElidedBytes > 0 ? `Output lines were cut at ${columnCap} bytes by the host bash executor, and the artifact is itself capped: ${columnElidedBytes} bytes were dropped from its middle, so the full output is unrecoverable. Set the host's \`tools.artifactMaxBytes\` to \`0\` for an uncapped file.` : `Output lines were cut at ${columnCap} bytes by the host bash executor, which reads global settings and ignores this session's tools.outputMaxColumns.`
+            note: artifactError !== void 0 ? `Output lines were cut at ${columnCap} bytes by the host bash executor and ${artifactFailureClause(artifactError)}, so the full output is unrecoverable.` : columnElidedBytes !== void 0 && columnElidedBytes > 0 ? `Output lines were cut at ${columnCap} bytes by the host bash executor, and the artifact is itself capped: ${columnElidedBytes} bytes were dropped from its middle, so the full output is unrecoverable. Set the host's \`tools.artifactMaxBytes\` to \`0\` for an uncapped file.` : oversizedBytes !== void 0 && fullOutputPath ? `Output lines were cut at ${columnCap} bytes by the host bash executor; the complete output is on disk at ${fullOutputPath}, ${oversizedBytes} bytes that exceed this session's \`executor.maxNestedResultChars\` (${maxChars}), so it was not inlined here.` : `Output lines were cut at ${columnCap} bytes by the host bash executor, which reads global settings and ignores this session's tools.outputMaxColumns.`
           });
         } else {
           output = restored;
@@ -11321,7 +11356,7 @@ var OmpToolsProvider = class _OmpToolsProvider {
       bash: createNativeBashToolDefinition(cwd, this.#artifacts, this.#identity, this.#autoBackground),
       edit: createNativeReplaceEditToolDefinition(cwd, this.#identity),
       write: createPreviewWriteToolDefinition(cwd, createNativeSession(cwd, { identity: this.#identity })),
-      grep: createGrepDefinitionWithSkip(cwd),
+      grep: createGrepDefinitionWithOptions(cwd),
       find: createFindDefinitionWithFilters(cwd),
       ls: createLsToolDefinition(cwd),
       wait: createNativeWaitToolDefinition(cwd, this.#identity, this.#autoBackground)
@@ -11550,6 +11585,10 @@ var OmpToolsProvider = class _OmpToolsProvider {
   // provider boundary; replacement is idempotent when middleware already ran.
   async #normalizeResult(name, result, args, context, appendReadNewline = true, artifacts) {
     const extras = {};
+    if (name === "grep") {
+      const limit = finiteNumber2(args.limit);
+      if (limit !== void 0) extras.grepLimit = limit;
+    }
     if (isOmpShellToolName(name)) {
       const artifactPath = artifacts?.at(-1);
       if (artifactPath !== void 0) extras.bashArtifactPath = artifactPath;