jev-agent-tools 0.1.3 → 0.2.0

package/src/tools/ask.ts

@@ -1,10 +1,11 @@
 import { createHash } from "node:crypto";
-import { resolve } from "node:path";
+import { isAbsolute, relative, resolve } from "node:path";
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "@sinclair/typebox";
 import { createAnalysisContext } from "../adapters/analysis-context.ts";
 import { collectAskRepository, repositoryPath } from "../adapters/ask-proof.ts";
 import { collectProofSyntax } from "../adapters/ask-syntax.ts";
+import { canonicalPath } from "../adapters/canonical-path.ts";
 import { captureCommand } from "../adapters/command.ts";
 import { collectFiles } from "../adapters/files.ts";
 import { shareGitInventory } from "../adapters/git-inventory.ts";
@@ -67,12 +68,8 @@ export const askParameters = Type.Object(
 );
 export type AskArgs = Static<typeof askParameters>;
 
-export function createAskTool({
-  client,
-  host,
-  runtime,
-  exec: execute,
-}: ToolDependencies) {
+export function createAskTool(dependencies: ToolDependencies) {
+  const { host, runtime, exec: execute } = dependencies;
   const { isOmp, names } = host;
   const allowCommand = process.env.JEV_TOOLS_ALLOW_COMMAND !== "0";
   const parameters = allowCommand
@@ -120,6 +117,8 @@ export function createAskTool({
         };
       };
     }> {
+      const client = dependencies.client;
+      const cwd = await canonicalPath(ctx.cwd);
       const started = performance.now();
       const exec = shareGitInventory(execute);
       const finish = (
@@ -162,7 +161,7 @@ export function createAskTool({
         return textResult("Provide state, command or at least one path.");
       const asks = compileAsks(args.asks, { surface: "ask" });
       if (!asks.ok) return textResult(asks.error);
-      const files = await collectFiles(ctx.cwd, args.paths ?? [], signal, {
+      const files = await collectFiles(cwd, args.paths ?? [], signal, {
         exec,
         allowEmpty: true,
         skipInvalidUtf8: true,
@@ -181,12 +180,7 @@ export function createAskTool({
         fact,
         next: "Provide this file as UTF-8 text if the judgment needs it.",
       }));
-      let repository = await collectAskRepository(
-        exec,
-        ctx.cwd,
-        args.base,
-        signal,
-      );
+      let repository = await collectAskRepository(exec, cwd, args.base, signal);
       if (!repository.ok && args.base) return textResult(repository.error);
       if (!repository.ok)
         proofLimitations.push({
@@ -196,7 +190,7 @@ export function createAskTool({
       const command = args.command
         ? await captureCommand(
             exec,
-            repository.ok ? repository.root : ctx.cwd,
+            repository.ok ? repository.root : cwd,
             args.command,
             args.timeout_s,
             signal,
@@ -204,12 +198,7 @@ export function createAskTool({
         : undefined;
       if (command && !command.ok) return textResult(command.error);
       if (command?.ok) {
-        repository = await collectAskRepository(
-          exec,
-          ctx.cwd,
-          args.base,
-          signal,
-        );
+        repository = await collectAskRepository(exec, cwd, args.base, signal);
         if (!repository.ok && args.base) return textResult(repository.error);
       }
       const initialState = assembleState(args.state, files.files);
@@ -223,6 +212,17 @@ export function createAskTool({
         for (const target of command.targets) {
           if (target.path.startsWith(`${repository.root}/`))
             target.path = target.path.slice(repository.root.length + 1);
+          else if (isAbsolute(target.path)) {
+            // Windows reports C:/... or short 8.3 forms; compare canonically.
+            const local = relative(
+              repository.root,
+              await canonicalPath(target.path),
+            )
+              .split("\\")
+              .join("/");
+            if (local && !local.startsWith("../") && !isAbsolute(local))
+              target.path = local;
+          }
           let matches = [...repository.known].filter(
             (path) => path === target.path || path.endsWith(`/${target.path}`),
           );
@@ -255,7 +255,7 @@ export function createAskTool({
           }
           const path = matches[0];
           if (!path) continue;
-          const local = repositoryPath(ctx.cwd, repository.root, path);
+          const local = repositoryPath(cwd, repository.root, path);
           if (!Object.hasOwn(files.files, local)) {
             const added = await collectFiles(repository.root, [path], signal, {
               exec,
@@ -351,7 +351,7 @@ export function createAskTool({
       if (repository?.ok) {
         const canonical = Object.fromEntries(
           Object.entries(files.files).map(([path, text]) => [
-            repositoryPath(repository.root, ctx.cwd, path),
+            repositoryPath(repository.root, cwd, path),
             text,
           ]),
         );
@@ -373,7 +373,7 @@ export function createAskTool({
               const canonicalPath =
                 references.additions.find(
                   (addition) => addition.reference === path,
-                )?.path ?? repositoryPath(repository.root, ctx.cwd, path);
+                )?.path ?? repositoryPath(repository.root, cwd, path);
               return [path, before[canonicalPath] ?? null];
             }),
           );
@@ -515,11 +515,11 @@ export function createAskTool({
       const identities = files.identities.map((file) => {
         const content = inserted[file.requestedPath];
         const insertedPath = Object.keys(inserted).find(
-          (path) => resolve(ctx.cwd, path) === file.resolvedPath,
+          (path) => resolve(cwd, path) === file.resolvedPath,
         );
         return {
           ...file,
-          insertedPath: insertedPath ? resolve(ctx.cwd, insertedPath) : "",
+          insertedPath: insertedPath ? resolve(cwd, insertedPath) : "",
           content: typeof content === "string" ? content : "",
           insertedSha256: createHash("sha256")
             .update(typeof content === "string" ? content : "")
@@ -547,6 +547,7 @@ export function createAskTool({
       const options = {
         signal,
         cache: !args.command,
+        ...runtime.session.requestGate(),
         beforeRequest: (questionCount: number) => {
           if (args.max_calls !== undefined && sent >= args.max_calls) {
             refusal = {
@@ -790,14 +791,14 @@ export function createAskTool({
           const selectedPath = repository?.ok
             ? (references.additions.find(
                 (addition) => addition.reference === selected,
-              )?.path ?? repositoryPath(repository.root, ctx.cwd, selected))
+              )?.path ?? repositoryPath(repository.root, cwd, selected))
             : selected;
           const retained = (path: string) => {
             if (!repository?.ok) return path !== selected;
             return (
               (references.additions.find(
                 (addition) => addition.reference === path,
-              )?.path ?? repositoryPath(repository.root, ctx.cwd, path)) !==
+              )?.path ?? repositoryPath(repository.root, cwd, path)) !==
               selectedPath
             );
           };

package/src/tools/check-diff.ts

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import { type Static, Type } from "@sinclair/typebox";
 import { createAnalysisContext } from "../adapters/analysis-context.ts";
+import { canonicalPath } from "../adapters/canonical-path.ts";
 import { collectUnits } from "../adapters/git.ts";
 import { resolveBase } from "../adapters/git-base.ts";
 import { shareGitInventory } from "../adapters/git-inventory.ts";
@@ -83,12 +84,8 @@ function unitLabel(unit: EvidenceUnit): string {
     .slice(0, 8);
   return `${unit.file}${range ? `:${range.start}-${range.end}` : ""} ${unit.name} [${fingerprint}]`;
 }
-export function createCheckDiffTool({
-  client,
-  host,
-  runtime,
-  exec: execute,
-}: ToolDependencies) {
+export function createCheckDiffTool(dependencies: ToolDependencies) {
+  const { host, runtime, exec: execute } = dependencies;
   return {
     name: "jev_check_diff",
     label: "Jev check diff",
@@ -110,19 +107,21 @@ export function createCheckDiffTool({
       _update: unknown,
       ctx: { cwd: string } & GuideContext,
     ) {
+      const client = dependencies.client;
+      const cwd = await canonicalPath(ctx.cwd);
       const exec = shareGitInventory(execute);
       if (args.check === "docs" || args.check === "spec") {
         const deps = { client, host, runtime, exec };
         const result =
           args.check === "docs"
             ? await runDocsCheck(deps, {
-                cwd: ctx.cwd,
+                cwd: cwd,
                 base: args.base,
                 signal,
                 maxCalls: args.max_calls,
               })
             : await runSpecCheck(deps, {
-                cwd: ctx.cwd,
+                cwd: cwd,
                 base: args.base,
                 specPath: args.spec_path,
                 signal,
@@ -226,14 +225,14 @@ export function createCheckDiffTool({
         };
       };
       if (!client) return finish(NOT_CONFIGURED);
-      const comparison = await resolveBase(exec, ctx.cwd, args.base, signal);
+      const comparison = await resolveBase(exec, cwd, args.base, signal);
       if (!comparison.ok) return finish(comparison.error);
       const base = comparison.base;
       const analysis = await createAnalysisContext();
       const collected = await collectUnits(
         exec,
         {
-          cwd: ctx.cwd,
+          cwd: cwd,
           base,
           signal,
         },
@@ -274,6 +273,7 @@ export function createCheckDiffTool({
       let reservedMatrixCalls = batches.batches.length;
       const optionsFor = (matrixRequest = false): JudgmentOptions => ({
         signal,
+        ...runtime.session.requestGate(),
         beforeRequest(questionCount) {
           if (matrixRequest && reservedMatrixCalls > 0) reservedMatrixCalls--;
           const limit =
@@ -315,7 +315,7 @@ export function createCheckDiffTool({
       )
         ? await collectRiskCallers(
             exec,
-            { cwd: ctx.cwd, base, signal },
+            { cwd: cwd, base, signal },
             collected.units,
             collected.files,
             analysis.parser,

package/src/tools/docs-check.ts

@@ -319,6 +319,7 @@ export async function runDocsCheck(
           prepared.questions,
           {
             signal,
+            ...deps.runtime.session.requestGate(),
             beforeRequest(questionCount) {
               if (budget?.kind === "session")
                 return { ok: false, error: budget.message };

package/src/tools/find.ts

@@ -1,4 +1,5 @@
 import { type Static, Type } from "@sinclair/typebox";
+import { canonicalPath } from "../adapters/canonical-path.ts";
 import { collectSearchExcerpts } from "../adapters/files.ts";
 import { prefilter } from "../adapters/find.ts";
 import { shareGitInventory } from "../adapters/git-inventory.ts";
@@ -46,12 +47,8 @@ export const findParameters = Type.Object(
   { additionalProperties: false },
 );
 export type FindArgs = Static<typeof findParameters>;
-export function createFindFilesTool({
-  client,
-  host,
-  runtime,
-  exec: execute,
-}: ToolDependencies) {
+export function createFindFilesTool(dependencies: ToolDependencies) {
+  const { host, runtime, exec: execute } = dependencies;
   return {
     name: "jev_find_files",
     label: "Jev find files",
@@ -77,6 +74,8 @@ export function createFindFilesTool({
       _update: unknown,
       ctx: { cwd: string } & GuideContext,
     ) {
+      const client = dependencies.client;
+      const cwd = await canonicalPath(ctx.cwd);
       const started = performance.now();
       const exec = shareGitInventory(execute);
       const totals = {
@@ -133,7 +132,7 @@ export function createFindFilesTool({
             : C.FIND_FILES_READ;
       const candidates = await prefilter(
         exec,
-        ctx.cwd,
+        cwd,
         keywords,
         candidateLimit,
         args.scope,
@@ -193,6 +192,7 @@ export function createFindFilesTool({
       ): Promise<Judgment> => {
         const result = await client.judge(state, questions, {
           signal,
+          ...runtime.session.requestGate(),
           beforeRequest: (count) => {
             if (args.max_calls !== undefined && sent >= args.max_calls) {
               budget = {
@@ -311,7 +311,7 @@ export function createFindFilesTool({
       const contentResults = await Promise.all(
         contentBatches.map(async (paths) => {
           const read = await collectSearchExcerpts(
-            ctx.cwd,
+            cwd,
             paths,
             keywords,
             signal,

package/src/tools/locate.ts

@@ -1,5 +1,6 @@
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "@sinclair/typebox";
+import { canonicalPath } from "../adapters/canonical-path.ts";
 import { shareGitInventory } from "../adapters/git-inventory.ts";
 import { readLocateFile, scanRange } from "../adapters/locate-file.ts";
 import { loadSyntaxParser } from "../adapters/syntax.ts";
@@ -43,9 +44,10 @@ const parameters = Type.Object(
 type LocateArgs = Static<typeof parameters>;
 
 export function createLocateTool(
-  { client, host, runtime, exec: execute }: ToolDependencies,
+  dependencies: ToolDependencies,
   loadParser: () => Promise<SyntaxParser | undefined> = loadSyntaxParser,
 ) {
+  const { host, runtime, exec: execute } = dependencies;
   return {
     name: "jev_locate_in_file",
     label: "Jev locate in file",
@@ -72,6 +74,8 @@ export function createLocateTool(
       _update: unknown,
       ctx: { cwd: string } & GuideContext,
     ) {
+      const client = dependencies.client;
+      const cwd = await canonicalPath(ctx.cwd);
       const started = performance.now();
       const exec = shareGitInventory(execute);
       const results: Judgment[] = [];
@@ -116,7 +120,7 @@ export function createLocateTool(
           ),
         };
       };
-      const file = await readLocateFile(ctx.cwd, args.path, signal, exec);
+      const file = await readLocateFile(cwd, args.path, signal, exec);
       if (!file.ok) return finish({ refusal: file.error });
       if (file.bytes < LOCATE_MIN_KB * 1000)
         return finish({
@@ -180,6 +184,7 @@ export function createLocateTool(
             },
             {
               signal,
+              ...runtime.session.requestGate(),
               beforeRequest: (n) => runtime.session.admit(n),
               onUsage: (usage) => runtime.session.recordUsage(usage),
             },
@@ -268,13 +273,7 @@ export function createLocateTool(
           });
         }
         if (file.kind === "outline") {
-          const selected = await scanRange(
-            ctx.cwd,
-            args.path,
-            block,
-            signal,
-            exec,
-          );
+          const selected = await scanRange(cwd, args.path, block, signal, exec);
           if (!selected.ok) return finish({ refusal: selected.error });
           const lines = selected.text.split("\n");
           sections = sections

package/src/tools/select-tests.ts

@@ -2,6 +2,7 @@ import { matchesGlob, relative, resolve } from "node:path";
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "@sinclair/typebox";
 import { createAnalysisContext } from "../adapters/analysis-context.ts";
+import { canonicalPath } from "../adapters/canonical-path.ts";
 import { collectUnits } from "../adapters/git.ts";
 import { resolveBase } from "../adapters/git-base.ts";
 import { shareGitInventory } from "../adapters/git-inventory.ts";
@@ -104,12 +105,8 @@ function makeCandidate(
   };
 }
 
-export function createSelectTestsTool({
-  client,
-  host,
-  runtime,
-  exec: execute,
-}: ToolDependencies) {
+export function createSelectTestsTool(dependencies: ToolDependencies) {
+  const { host, runtime, exec: execute } = dependencies;
   return {
     name: "jev_select_tests",
     label: "Jev select tests",
@@ -128,6 +125,8 @@ export function createSelectTestsTool({
       _update: unknown,
       ctx: { cwd: string } & GuideContext,
     ) {
+      const client = dependencies.client;
+      const cwd = await canonicalPath(ctx.cwd);
       const started = performance.now();
       const exec = shareGitInventory(execute);
       const totals = {
@@ -171,14 +170,14 @@ export function createSelectTestsTool({
           ...hostUsage(host.isOmp, costKnown ? totals.usage : undefined),
         };
       };
-      const comparison = await resolveBase(exec, ctx.cwd, args.base, signal);
+      const comparison = await resolveBase(exec, cwd, args.base, signal);
       if (!comparison.ok) return finish({ refusal: comparison.error });
       const analysis = await createAnalysisContext();
       const [inventory, diff] = await Promise.all([
-        collectTestInventory(exec, ctx.cwd, signal),
+        collectTestInventory(exec, cwd, signal),
         collectUnits(
           exec,
-          { cwd: ctx.cwd, base: comparison.base, signal },
+          { cwd: cwd, base: comparison.base, signal },
           analysis.parser,
         ),
       ]);
@@ -390,6 +389,7 @@ export function createSelectTestsTool({
         const result = await client.judge(state, questions, {
           signal,
           witnesses: witnessIds,
+          ...runtime.session.requestGate(),
           beforeRequest: (questionCount) => {
             if (args.max_calls !== undefined && sent >= args.max_calls) {
               budget = {
@@ -738,7 +738,7 @@ export function createSelectTestsTool({
         lines: commands.commands.map((command) => ({
           type: "command" as const,
           ...command,
-          cwd: relative(ctx.cwd, resolve(inventory.cwd, command.cwd)) || ".",
+          cwd: relative(cwd, resolve(inventory.cwd, command.cwd)) || ".",
         })),
       });
     },

package/src/tools/spec-check.ts

@@ -175,6 +175,7 @@ export async function runSpecCheck(
   if (!units.length) return finish();
   const judgment = await deps.client.judge(prepared.state, prepared.questions, {
     signal: input.signal,
+    ...deps.runtime.session.requestGate(),
     beforeRequest(questionCount) {
       if (input.maxCalls !== undefined && sent >= input.maxCalls) {
         budget = {