@odla-ai/harness 0.7.0 → 0.7.1

package/dist/code-runtime-cli.cjs

@@ -1401,7 +1401,10 @@ Never claim a build or test passed unless odla_run_recipe returned that result.`
 var V2_SYSTEM_PROMPT = `You are the coding agent inside an odla Code harness.
 Start by orienting: odla_list shows the files in the workspace and odla_search
 finds a literal string across them. Prefer those over guessing a path.
-Then odla_read a bounded range, and odla_apply_git_diff to mutate.
+Then odla_read a bounded range, and odla_apply_git_diff to mutate. When you
+need several independent searches or file ranges, issue those read-only calls
+together in one turn; their results stay ordered and the harness overlaps them.
+Never issue odla_apply_git_diff or odla_run_recipe alongside another tool call.
 For mutations, call odla_apply_git_diff with raw git diff text. It must start
 with "diff --git a/<path> b/<path>", include matching "---" and "+++" file
 headers and numbered "@@" hunks, and never use "*** Begin Patch" wrappers.
@@ -1432,18 +1435,26 @@ var SYSTEM_PROMPT_FOR = {
 };
 function codeSkill(opts) {
   let seq = 0;
+  let nextCompletion = 1;
+  const completed = /* @__PURE__ */ new Map();
   const call = async (tool, input, signal) => {
+    const sequence = ++seq;
     const startedAt = Date.now();
     const response2 = await opts.broker.execute(
       { lease: opts.lease, workspaceDir: opts.workspaceDir, signal },
-      { requestId: `bench-${tool}-${++seq}`, tool, input }
+      { requestId: `bench-${tool}-${sequence}`, tool, input }
     );
-    opts.onToolCall?.({
+    completed.set(sequence, {
       tool,
       ok: response2.ok,
       durationMs: Date.now() - startedAt,
       ...response2.ok ? {} : { error: String(response2.content).slice(0, 300) }
     });
+    while (completed.has(nextCompletion)) {
+      const completion = completed.get(nextCompletion);
+      completed.delete(nextCompletion++);
+      opts.onToolCall?.(completion);
+    }
     return { content: response2.content, isError: !response2.ok };
   };
   const read2 = {
@@ -1459,6 +1470,7 @@ function codeSkill(opts) {
       },
       additionalProperties: false
     },
+    concurrency: "parallel",
     handler: (input, ctx) => call("sandbox.read", input, ctx.signal)
   };
   const applyPatch = {
@@ -1500,6 +1512,7 @@ function codeSkill(opts) {
       },
       additionalProperties: false
     },
+    concurrency: "parallel",
     handler: (input, ctx) => call("sandbox.list", input, ctx.signal)
   };
   const searchFiles = {
@@ -1516,11 +1529,13 @@ function codeSkill(opts) {
       },
       additionalProperties: false
     },
+    concurrency: "parallel",
     handler: (input, ctx) => call("sandbox.search", input, ctx.signal)
   };
   const graphTool = (name, tool, description, required) => ({
     name,
     description,
+    concurrency: "parallel",
     inputSchema: {
       type: "object",
       ...required ? { required: ["query"] } : {},
@@ -1950,11 +1965,30 @@ function response(request, ok, content, details) {
 var import_promises9 = require("fs/promises");
 
 // src/code-tool-discovery.ts
+var import_node_child_process5 = require("child_process");
 var import_promises7 = require("fs/promises");
 var import_node_path8 = require("path");
 var DEFAULT_MAX_FILES = 2e4;
 var DEFAULT_MAX_RESULTS = 100;
 var DEFAULT_MAX_FILE_BYTES = 512 * 1024;
+function createWorkspaceFileRegistry(limit = DEFAULT_MAX_FILES, enumerate = registeredFiles) {
+  const cache2 = /* @__PURE__ */ new Map();
+  return {
+    files(root) {
+      const existing = cache2.get(root);
+      if (existing) return existing;
+      const pending = enumerate(root, limit).then((paths) => Object.freeze(paths));
+      cache2.set(root, pending);
+      void pending.catch(() => {
+        if (cache2.get(root) === pending) cache2.delete(root);
+      });
+      return pending;
+    },
+    invalidate(root) {
+      cache2.delete(root);
+    }
+  };
+}
 async function registeredFiles(root, limit = DEFAULT_MAX_FILES) {
   const paths = [];
   const walk = async (directory) => {
@@ -1985,28 +2019,122 @@ function listWorkspace(paths, options = {}) {
   return scoped.slice(0, max);
 }
 async function searchWorkspace(root, paths, options) {
-  const query = options.caseSensitive === false ? options.query.toLowerCase() : options.query;
-  if (!query) throw new TypeError("search query must be a non-empty string");
+  options.signal?.throwIfAborted();
+  if (!options.query) throw new TypeError("search query must be a non-empty string");
   const maxResults = options.maxResults ?? DEFAULT_MAX_RESULTS;
   const maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
   const scoped = listWorkspace(paths, { ...options.prefix ? { prefix: options.prefix } : {}, maxEntries: paths.length });
+  if (scoped.length === 0) return [];
+  try {
+    return await nativeSearch(root, scoped, { ...options, maxResults, maxFileBytes });
+  } catch (error) {
+    options.signal?.throwIfAborted();
+    return fallbackSearch(root, scoped, { ...options, maxResults, maxFileBytes });
+  }
+}
+var MAX_NATIVE_ARG_BYTES = 96 * 1024;
+async function nativeSearch(root, paths, options) {
+  const batches = [];
+  let batch = [];
+  let bytes = 0;
+  for (const path of paths) {
+    const size = Buffer.byteLength(path) + 1;
+    if (batch.length > 0 && bytes + size > MAX_NATIVE_ARG_BYTES) {
+      batches.push(batch);
+      batch = [];
+      bytes = 0;
+    }
+    batch.push(path);
+    bytes += size;
+  }
+  if (batch.length > 0) batches.push(batch);
+  const matches = [];
+  for (const files of batches) {
+    const remaining = options.maxResults - matches.length;
+    if (remaining <= 0) break;
+    matches.push(...await nativeSearchBatch(root, files, options, remaining));
+  }
+  return matches;
+}
+function nativeSearchBatch(root, paths, options, remaining) {
+  return new Promise((resolveMatches, reject) => {
+    const args = [
+      "--fixed-strings",
+      "--json",
+      "--no-messages",
+      "--sort=path",
+      `--max-filesize=${options.maxFileBytes}`,
+      "--max-columns=4096",
+      "--max-columns-preview",
+      options.caseSensitive === false ? "--ignore-case" : "--case-sensitive",
+      "--",
+      options.query,
+      ...paths
+    ];
+    const child = (0, import_node_child_process5.spawn)("rg", args, {
+      cwd: root,
+      stdio: ["ignore", "pipe", "ignore"],
+      ...options.signal ? { signal: options.signal } : {}
+    });
+    const matches = [];
+    let carry = "";
+    let stopped = false;
+    const consume = (line) => {
+      if (matches.length >= remaining) return;
+      let event;
+      try {
+        event = JSON.parse(line);
+      } catch {
+        return;
+      }
+      const path = event.data?.path?.text;
+      const lineNumber = event.data?.line_number;
+      const source = event.data?.lines?.text;
+      if (event.type !== "match" || path === void 0 || lineNumber === void 0 || source === void 0) return;
+      matches.push({ path, line: lineNumber, text: source.trim().slice(0, 240) });
+      if (matches.length >= remaining) {
+        stopped = true;
+        child.kill();
+      }
+    };
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      carry += chunk;
+      let newline = carry.indexOf("\n");
+      while (newline >= 0) {
+        consume(carry.slice(0, newline));
+        carry = carry.slice(newline + 1);
+        newline = carry.indexOf("\n");
+      }
+    });
+    child.once("error", reject);
+    child.once("close", (code) => {
+      if (carry) consume(carry);
+      if (stopped || code === 0 || code === 1) resolveMatches(matches);
+      else reject(new Error(`native search exited with status ${code ?? "unknown"}`));
+    });
+  });
+}
+async function fallbackSearch(root, scoped, options) {
+  const query = options.caseSensitive === false ? options.query.toLowerCase() : options.query;
   const matches = [];
   for (const path of scoped) {
-    if (matches.length >= maxResults) break;
+    options.signal?.throwIfAborted();
+    if (matches.length >= options.maxResults) break;
     let source;
     try {
       source = await (0, import_promises7.readFile)((0, import_node_path8.resolve)(root, path));
     } catch {
       continue;
     }
-    if (source.byteLength > maxFileBytes || source.includes(0)) continue;
+    if (source.byteLength > options.maxFileBytes || source.includes(0)) continue;
     const lines = source.toString("utf8").split("\n");
     for (let index = 0; index < lines.length; index += 1) {
       const raw = lines[index];
       const haystack = options.caseSensitive === false ? raw.toLowerCase() : raw;
       if (!haystack.includes(query)) continue;
       matches.push({ path, line: index + 1, text: raw.trim().slice(0, 240) });
-      if (matches.length >= maxResults) break;
+      if (matches.length >= options.maxResults) break;
     }
   }
   return matches;
@@ -2031,6 +2159,9 @@ function workspaceGraphs(workspaceDir, paths) {
   cache.set(workspaceDir, built);
   return built;
 }
+function forgetWorkspaceGraphs(workspaceDir) {
+  cache.delete(workspaceDir);
+}
 var shortId = (id) => id.slice(id.indexOf(":") + 1);
 function renderOverview(graphs, prefix) {
   const rows = (0, import_graph.rollup)(graphs.graph, import_code4.FILE, prefix === void 0 ? {} : { prefix });
@@ -2077,7 +2208,7 @@ var GRAPH_TOOLS = /* @__PURE__ */ new Set([
   "sandbox.who_imports",
   "sandbox.who_touches"
 ]);
-async function read(context, request, options, policy) {
+async function read(context, request, options, policy, registry) {
   exactKeys(request.input, ["path", "startLine", "endLine"]);
   const path = stringField(request.input, "path");
   const startLine = optionalInteger(request.input.startLine) ?? 1;
@@ -2085,7 +2216,7 @@ async function read(context, request, options, policy) {
   if (endLine < startLine || endLine - startLine + 1 > (options.maxReadLines ?? 2e3)) {
     throw new TypeError("requested line range exceeds its bound");
   }
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   if (!paths.includes(path)) {
     throw new TypeError(`no such file in the staged workspace: "${path}". Use sandbox.overview, sandbox.where_is or sandbox.search to find the correct path.`);
   }
@@ -2105,13 +2236,13 @@ async function read(context, request, options, policy) {
   }
   return response(request, true, content, { path, startLine, endLine: Math.min(endLine, lines.length) });
 }
-async function list(context, request, options, policy) {
+async function list(context, request, options, policy, registry) {
   exactKeys(request.input, ["prefix", "maxEntries"]);
   const raw = request.input.prefix;
   const prefix = typeof raw === "string" && raw.length > 0 ? raw : void 0;
   const maxEntries = optionalInteger(request.input.maxEntries) ?? 1e3;
   if (maxEntries > 5e3) throw new TypeError("maxEntries exceeds its bound");
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   const allowed = await policy.list(policyContext(context, request, options, { paths, ...prefix ? { prefix } : {} }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
   const entries = listWorkspace(paths, { ...prefix ? { prefix } : {}, maxEntries });
@@ -2129,7 +2260,7 @@ async function list(context, request, options, policy) {
     { count: entries.length, truncated }
   );
 }
-async function search(context, request, options, policy) {
+async function search(context, request, options, policy, registry) {
   exactKeys(request.input, ["query", "prefix", "maxResults", "caseSensitive"]);
   const query = stringField(request.input, "query");
   if (query.length > 512) throw new TypeError("search query exceeds its bound");
@@ -2138,21 +2269,22 @@ async function search(context, request, options, policy) {
   const maxResults = optionalInteger(request.input.maxResults) ?? 100;
   if (maxResults > 500) throw new TypeError("maxResults exceeds its bound");
   const caseSensitive = request.input.caseSensitive === void 0 ? true : request.input.caseSensitive === true;
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   const allowed = await policy.search(policyContext(context, request, options, { paths, query, ...prefix ? { prefix } : {} }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
   const matches = await searchWorkspace(context.workspaceDir, paths, {
     query,
     maxResults,
     caseSensitive,
-    ...prefix ? { prefix } : {}
+    ...prefix ? { prefix } : {},
+    ...context.signal ? { signal: context.signal } : {}
   });
   if (!matches.length) return response(request, true, `No match for "${query}".`, { count: 0 });
   return response(request, true, matches.map((match) => `${match.path}:${match.line}: ${match.text}`).join("\n"), {
     count: matches.length
   });
 }
-async function graphQuery(context, request, options, policy) {
+async function graphQuery(context, request, options, policy, registry) {
   exactKeys(request.input, ["query"]);
   const raw = request.input.query;
   const query = typeof raw === "string" ? raw : "";
@@ -2162,7 +2294,7 @@ async function graphQuery(context, request, options, policy) {
     selector: query
   }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
-  const paths = await registeredFiles(context.workspaceDir, 2e4);
+  const paths = await registry.files(context.workspaceDir);
   const graphs = await workspaceGraphs(context.workspaceDir, paths);
   if (request.tool === "sandbox.overview") {
     return response(request, true, renderOverview(graphs, query || void 0));
@@ -2178,23 +2310,38 @@ function createCodeToolBroker(options) {
   validateOptions(options);
   const recipes = new Map(options.recipes.map((recipe2) => [recipe2.id, recipe2]));
   const policy = createCodePolicyGate(options);
-  let tail = Promise.resolve();
+  const registry = createWorkspaceFileRegistry();
+  let barrier = Promise.resolve();
+  const activeReads = /* @__PURE__ */ new Set();
   return {
     execute(context, request) {
-      const result = tail.then(() => route(context, request, options, recipes, policy));
-      tail = result.then(() => void 0, () => void 0);
+      if (isReadTool(request.tool)) {
+        const result2 = barrier.then(() => route(context, request, options, recipes, policy, registry));
+        const settled = result2.then(() => void 0, () => void 0);
+        activeReads.add(settled);
+        void settled.then(() => {
+          activeReads.delete(settled);
+        });
+        return result2;
+      }
+      const earlierReads = [...activeReads];
+      const result = barrier.then(() => Promise.all(earlierReads)).then(() => route(context, request, options, recipes, policy, registry));
+      barrier = result.then(() => void 0, () => void 0);
       return result;
     }
   };
 }
-async function route(context, request, options, recipes, policy) {
+function isReadTool(tool) {
+  return tool === "sandbox.read" || tool === "sandbox.list" || tool === "sandbox.search" || GRAPH_TOOLS.has(tool);
+}
+async function route(context, request, options, recipes, policy, registry) {
   try {
     if (context.signal?.aborted) throw new TypeError("tool request was cancelled");
-    if (request.tool === "sandbox.read") return await read(context, request, options, policy);
-    if (request.tool === "sandbox.list") return await list(context, request, options, policy);
-    if (request.tool === "sandbox.search") return await search(context, request, options, policy);
-    if (GRAPH_TOOLS.has(request.tool)) return await graphQuery(context, request, options, policy);
-    if (request.tool === "sandbox.apply_patch") return await patch(context, request, options, policy);
+    if (request.tool === "sandbox.read") return await read(context, request, options, policy, registry);
+    if (request.tool === "sandbox.list") return await list(context, request, options, policy, registry);
+    if (request.tool === "sandbox.search") return await search(context, request, options, policy, registry);
+    if (GRAPH_TOOLS.has(request.tool)) return await graphQuery(context, request, options, policy, registry);
+    if (request.tool === "sandbox.apply_patch") return await patch(context, request, options, policy, registry);
     return await recipe(context, request, options, recipes, policy);
   } catch (reason) {
     return response(request, false, toolFailureMessage(reason));
@@ -2209,7 +2356,7 @@ function toolFailureMessage(reason) {
   if (code === "EACCES" || code === "EPERM") return "that path is not readable through this tool";
   return "tool failed closed";
 }
-async function patch(context, request, options, policy) {
+async function patch(context, request, options, policy, registry) {
   exactKeys(request.input, ["patch"]);
   const value = stringField(request.input, "patch");
   const paths = validateCodePatch(value, options.maxPatchBytes ?? 256 * 1024);
@@ -2219,6 +2366,8 @@ async function patch(context, request, options, policy) {
   const allowed = await policy.patch(policyContext(context, request, options, { patch: value }));
   if (!allowed) return response(request, false, "tool denied by CaMeL policy");
   await applyCodePatch(context.workspaceDir, value, paths);
+  registry.invalidate(context.workspaceDir);
+  forgetWorkspaceGraphs(context.workspaceDir);
   return response(request, true, `Applied patch to ${paths.length} file(s).`, { paths });
 }
 async function recipe(context, request, options, recipes, policy) {