omp-fabric 1.3.0 → 1.3.2

package/dist/fabric-runtime-state.js

@@ -94,7 +94,7 @@ import {
   resolveAgentCwd,
   resolveOmpBinary,
   validateAgentCwdRequest
-} from "./chunks/chunk-7MFYALJI.js";
+} from "./chunks/chunk-45URY66G.js";
 import "./chunks/chunk-VPPIJRNZ.js";
 import {
   executeFile,
@@ -114,7 +114,7 @@ import {
   resolveAgentDir,
   resolveAvailableOmpModel,
   resolveFabricModel
-} from "./chunks/chunk-XRJYPNTI.js";
+} from "./chunks/chunk-WZAH7BO2.js";
 import {
   FABRIC_ACTOR_HOST_EVENTS,
   isFabricActorHostEvent,
@@ -7505,6 +7505,12 @@ var KIND_RANK = {
   const: 1
 };
 var MATCH_TIMEOUT_MS = 12e4;
+var isBudgetTimeout = (error, budgetMs, startedAt) => {
+  if (budgetMs === void 0) return false;
+  if (Date.now() - startedAt >= budgetMs) return true;
+  const message2 = error instanceof Error ? error.message : String(error);
+  return /timeout/i.test(message2);
+};
 var MAX_FALLBACK_BYTES = 2e6;
 var extensionOf = (file) => {
   const slash = file.lastIndexOf("/");
@@ -7605,12 +7611,13 @@ var gitTrackedFiles = async (root, matcher, signal) => {
   }
   return found;
 };
-var walkFiles = async (root, matcher, signal) => {
+var walkFiles = async (root, matcher, signal, expired) => {
   const found = [];
   const pending = [""];
   while (pending.length > 0) {
     const directory = pending.pop() ?? "";
     throwIfAborted(signal);
+    if (expired?.() === true) break;
     let entries;
     try {
       entries = await readdir(directory === "" ? root : path8.join(root, directory), {
@@ -7635,7 +7642,7 @@ var walkFiles = async (root, matcher, signal) => {
   }
   return found;
 };
-var discoverFiles = async (root, matcher, signal) => await gitTrackedFiles(root, matcher, signal) ?? await walkFiles(root, matcher, signal);
+var discoverFiles = async (root, matcher, signal, expired) => await gitTrackedFiles(root, matcher, signal) ?? await walkFiles(root, matcher, signal, expired);
 var COMMENT_HEAD = /^(?:\/\/|\/\*|\*|#|--|<!--|;|%)/;
 var IMPORT_HEAD = /^(?:import|from|require|include|use|using|package|open|load|source)\b/;
 var DECLARATION_HEAD = /^(?:export|pub|public|private|protected|internal|static|final|abstract|override|virtual|inline|async|unsafe|extern|shared|readonly|declare|local|def|defp|defmodule|defstruct|defmacro|class|module|namespace|record|object|data|struct|enum|union|interface|trait|protocol|actor|impl|extension|fn|func|function|sub|procedure|method|const|let|var|val|type|typedef|typealias|template|operator|constructor|init|property|event|signal|macro|task)\b/;
@@ -7797,13 +7804,19 @@ var compareSymbols = (left, right) => {
 };
 async function buildSymbolIndex(request) {
   const startedAt = Date.now();
+  const budgetMs = request.maxMs !== void 0 && request.maxMs > 0 ? request.maxMs : void 0;
+  const remainingMs = () => budgetMs === void 0 ? void 0 : Math.max(0, budgetMs - (Date.now() - startedAt));
+  const outOfTime = () => {
+    const left = remainingMs();
+    return left !== void 0 && left <= 0;
+  };
   const signal = request.signal;
   throwIfAborted(signal);
   const root = path8.resolve(request.root);
   const matcher = request.glob === void 0 ? void 0 : globToRegExp(request.glob);
-  const discovered = await discoverFiles(root, matcher, signal);
+  const discovered = await discoverFiles(root, matcher, signal, outOfTime);
   discovered.sort();
-  let truncated = false;
+  let truncated = outOfTime();
   let files = discovered;
   if (files.length > request.maxFiles) {
     files = discovered.slice(0, request.maxFiles);
@@ -7832,19 +7845,31 @@ async function buildSymbolIndex(request) {
   for (const spec of LANGUAGE_SPECS) {
     if (!activeSpecs.has(spec.id)) continue;
     throwIfAborted(signal);
+    if (outOfTime()) {
+      truncated = true;
+      break;
+    }
     const scoped = [];
     for (const [file, id] of assigned) if (id === spec.id) scoped.push(file);
     const prefix = commonDirectory(scoped);
-    const result = await natives.astGrep({
-      patterns: spec.patterns,
-      lang: spec.lang,
-      path: prefix === "" ? root : path8.join(root, prefix),
-      glob: spec.glob,
-      includeMeta: true,
-      limit: matchLimit,
-      timeoutMs: MATCH_TIMEOUT_MS,
-      ...signal ? { signal } : {}
-    });
+    let result;
+    try {
+      result = await natives.astGrep({
+        patterns: spec.patterns,
+        lang: spec.lang,
+        path: prefix === "" ? root : path8.join(root, prefix),
+        glob: spec.glob,
+        includeMeta: true,
+        limit: matchLimit,
+        timeoutMs: Math.min(MATCH_TIMEOUT_MS, remainingMs() ?? MATCH_TIMEOUT_MS),
+        ...signal ? { signal } : {}
+      });
+    } catch (error) {
+      throwIfAborted(signal);
+      if (!isBudgetTimeout(error, budgetMs, startedAt)) throw error;
+      truncated = true;
+      break;
+    }
     if (result.limitReached) truncated = true;
     for (const match of result.matches) {
       const relative = toPosix2(match.path);
@@ -7864,6 +7889,10 @@ async function buildSymbolIndex(request) {
   }
   for (const file of fallbackFiles) {
     throwIfAborted(signal);
+    if (outOfTime()) {
+      truncated = true;
+      break;
+    }
     let code;
     try {
       code = await readFile(path8.join(root, file), "utf8");
@@ -8015,6 +8044,7 @@ var CodemapProvider = class {
       ...glob !== void 0 ? { glob } : {},
       maxFiles: this.config.maxFiles,
       maxSymbols: this.config.maxSymbols,
+      maxMs: this.config.maxMs,
       ...signal !== void 0 ? { signal } : {}
     });
     this.#cache.set(key, { index, at: Date.now() });
@@ -9731,6 +9761,7 @@ import { homedir } from "node:os";
 import { dirname, isAbsolute, resolve, win32 } from "node:path";
 import { mkdir, readFile as readFile2, stat, writeFile } from "node:fs/promises";
 import { Type as Type4 } from "@oh-my-pi/pi-coding-agent/extensibility/legacy-typebox";
+import { WriteTool } from "@oh-my-pi/pi-coding-agent/tools/write";
 var mutationQueues = /* @__PURE__ */ new Map();
 var withFileMutationQueue = async (path20, operation) => {
   const previous = mutationQueues.get(path20) ?? Promise.resolve();
@@ -9748,29 +9779,18 @@ var withFileMutationQueue = async (path20, operation) => {
   }
 };
 var URI_LIKE_WRITE_TARGET_RE = /^([a-z][a-z0-9+.-]*):\/{1,2}/i;
-var OmpWriteUriTargetError = class extends Error {
-  path;
-  constructor(message2, path20) {
-    super(message2);
-    this.name = "OmpWriteUriTargetError";
-    this.path = path20;
-  }
-};
-var assertFilesystemWriteTarget = (candidate, reported) => {
+var uriLikeScheme = (candidate) => {
   const trimmed = candidate.trim();
-  if (win32.isAbsolute(trimmed)) return;
-  const scheme = URI_LIKE_WRITE_TARGET_RE.exec(trimmed)?.[1]?.toLowerCase();
-  if (scheme === void 0) return;
-  const guidance = scheme === "xd" ? "Tool devices are dispatched by the top-level `write` tool, which carries the xd:// transport; omp.write writes files." : "omp.write resolves filesystem paths only.";
-  throw new OmpWriteUriTargetError(
-    `Refusing to write '${reported}': '${scheme}://' is a URI scheme, not a directory. ${guidance} Prefix the path with './' to create a literal file by that name.`,
-    reported
-  );
+  if (win32.isAbsolute(trimmed)) return void 0;
+  return URI_LIKE_WRITE_TARGET_RE.exec(trimmed)?.[1]?.toLowerCase();
+};
+var isUriLikeWriteTarget = (filePath) => {
+  const expanded = filePath.startsWith("@") ? filePath.slice(1) : filePath;
+  return uriLikeScheme(expanded.replace(/[\u00a0\u2000-\u200a\u202f\u205f\u3000]/g, " ")) !== void 0;
 };
 var resolvePreviewPath = (filePath, cwd) => {
   let expanded = filePath.startsWith("@") ? filePath.slice(1) : filePath;
   expanded = expanded.replace(/[\u00a0\u2000-\u200a\u202f\u205f\u3000]/g, " ");
-  assertFilesystemWriteTarget(expanded, filePath);
   if (expanded === "~") expanded = homedir();
   else if (expanded.startsWith("~/")) expanded = homedir() + expanded.slice(1);
   return isAbsolute(expanded) ? expanded : resolve(cwd, expanded);
@@ -9807,7 +9827,7 @@ var readExistingFileForPreview = async (filePath, cwd, nextContent) => {
     return skipped("previous content unavailable", fileStat.size);
   }
 };
-var createPreviewWriteToolDefinition = (cwd) => {
+var createPreviewWriteToolDefinition = (cwd, session) => {
   const original = {
     name: "write",
     label: "Write",
@@ -9819,6 +9839,21 @@ var createPreviewWriteToolDefinition = (cwd) => {
     ...original,
     async execute(_toolCallId, params, signal) {
       const { path: path20, content } = params;
+      if (isUriLikeWriteTarget(path20)) {
+        if (session === void 0) {
+          throw new Error(
+            `Refusing to write '${path20}': URI-like targets need a host session to resolve. Prefix the path with './' to create a literal file by that name.`
+          );
+        }
+        return await new WriteTool(session).execute(
+          _toolCallId,
+          params,
+          signal,
+          (() => {
+          }),
+          { signal }
+        );
+      }
       const absolutePath = resolvePreviewPath(path20, cwd);
       return withFileMutationQueue(absolutePath, async () => {
         const throwIfAborted2 = () => {
@@ -10414,7 +10449,7 @@ var OmpToolsProvider = class _OmpToolsProvider {
       read: createNativeReadToolDefinition(cwd),
       bash: createNativeBashToolDefinition(cwd, this.#artifactPaths),
       edit: createNativeReplaceEditToolDefinition(cwd),
-      write: createPreviewWriteToolDefinition(cwd),
+      write: createPreviewWriteToolDefinition(cwd, createNativeSession(cwd)),
       grep: createGrepDefinitionWithSkip(cwd),
       find: createFindDefinitionWithFilters(cwd),
       ls: createLsToolDefinition(cwd)