@aria-cli/tools 1.0.2 → 1.0.3

package/tests/executors/frg-session-content.test.ts

@@ -0,0 +1,40 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import * as os from "node:os";
+import {
+  clearPendingFrgMutations,
+  recordFrgMutation,
+  searchPendingFrgMutations,
+} from "../../src/executors/frg-freshness.js";
+
+describe("frg session content cache", () => {
+  let repoDir: string;
+  let filePath: string;
+
+  beforeEach(async () => {
+    repoDir = await fs.mkdtemp(path.join(os.tmpdir(), "aria-frg-session-content-"));
+    await fs.mkdir(path.join(repoDir, ".git"));
+    filePath = path.join(repoDir, "a.ts");
+    await fs.writeFile(filePath, 'export const value = "old";\n', "utf8");
+    clearPendingFrgMutations(repoDir);
+  });
+
+  it("uses cached mutation content even if on-disk content changes before flush", async () => {
+    const sessionContent = 'export const value = "session";\n';
+    await fs.writeFile(filePath, sessionContent, "utf8");
+    recordFrgMutation(filePath, "write", sessionContent);
+
+    await fs.writeFile(filePath, 'export const value = "disk";\n', "utf8");
+
+    const result = await searchPendingFrgMutations(repoDir, {
+      pattern: "session",
+      literal: true,
+    });
+
+    expect(result?.mode).toBe("matches");
+    const matches = result && result.mode === "matches" ? (result.matches ?? []) : [];
+    expect(matches).toHaveLength(1);
+    expect(matches[0]?.content).toContain("session");
+  });
+});

package/tests/executors/frg.test.ts

@@ -0,0 +1,56 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import * as os from "node:os";
+import type { ToolContext } from "../../src/types.js";
+import { SpawnedProcessRegistry } from "../../src/executors/process-registry.js";
+import { executeFrg } from "../../src/executors/frg.js";
+
+const sleep = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
+
+describe("frg executor", () => {
+  let tempDir: string;
+  let ctx: ToolContext;
+  let registry: SpawnedProcessRegistry;
+  const pidsToCleanup: number[] = [];
+
+  beforeEach(async () => {
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "aria-frg-test-"));
+    registry = new SpawnedProcessRegistry();
+    ctx = {
+      workingDir: tempDir,
+      env: {},
+      confirm: async () => true,
+      processRegistry: registry,
+    };
+  });
+
+  afterEach(async () => {
+    for (const pid of pidsToCleanup) {
+      try {
+        process.kill(pid, "SIGKILL");
+      } catch {
+        // ignore
+      }
+    }
+    await fs.rm(tempDir, { recursive: true, force: true });
+  });
+
+  it("spawns a tracked background process for watch mode", async () => {
+    const result = await executeFrg({ command: "watch", path: tempDir }, ctx);
+    if (!result.success) {
+      expect(String(result.error ?? result.message ?? "")).toContain("binary not found");
+      return;
+    }
+
+    const data = result.data as { pid?: number; watched?: boolean };
+    expect(data.watched).toBe(true);
+    expect(typeof data.pid).toBe("number");
+    if (typeof data.pid === "number") {
+      pidsToCleanup.push(data.pid);
+      expect(registry.has(data.pid)).toBe(true);
+    }
+
+    await sleep(100);
+  }, 20000);
+});

package/tests/integration/headless-control-contract.integration.test.ts

@@ -34,6 +34,7 @@ describe("headless control contract", () => {
       HEADLESS_OPERATION_SCHEMAS["run.start"].input.safeParse({
         task: "hello",
         sessionId: "session-1",
+        requestedModel: "opus-4.6",
       }).success,
     ).toBe(true);
     expect(RunRequestSchema.safeParse({ task: "hello", sessionId: "session-1" }).success).toBe(
@@ -44,6 +45,7 @@ describe("headless control contract", () => {
     expect(
       HEADLESS_OPERATION_SCHEMAS["run.resume"].input.safeParse({
         sessionId: "session-1",
+        requestedModel: "opus-4.6",
         state: {
           input: "resume",
           messages: [],

package/tests/loading-tier.test.ts

@@ -33,7 +33,7 @@ describe("loadingTier", () => {
   });
 
   describe("All built-in tools are always-on or explicitly deferred", () => {
-    const ALLOWED_DEFERRED = new Set(["session_history", "self_diagnose"]);
+    const ALLOWED_DEFERRED = new Set(["session_history", "frg"]);
     it("every core tool has loadingTier === 'always' except explicitly deferred tools", () => {
       for (const t of CORE_TOOL_DEFINITIONS) {
         if (ALLOWED_DEFERRED.has(t.name)) {
@@ -107,9 +107,9 @@ describe("loadingTier", () => {
   });
 
   describe("Total core tools split", () => {
-    it("62 always + 2 deferred = 64 total core tools", () => {
-      // Verify total count
-      expect(CORE_TOOL_DEFINITIONS.length).toBe(64);
+    it("72 always + 2 deferred = 74 total core tools", () => {
+      // 64 original + 4 frg + 8 code-intel (rg,ug,probe,sg,cbm,lsp,serena,fff) - 3 removed + 1 code_search = 74
+      expect(CORE_TOOL_DEFINITIONS.length).toBe(74);
 
       const alwaysTools = CORE_TOOL_DEFINITIONS.filter(
         (t) => (t as Record<string, unknown>).loadingTier === "always",
@@ -118,9 +118,9 @@ describe("loadingTier", () => {
         (t) => (t as Record<string, unknown>).loadingTier === "deferred",
       );
 
-      expect(alwaysTools.length).toBe(62);
+      expect(alwaysTools.length).toBe(72);
       expect(deferredTools.length).toBe(2);
-      expect(alwaysTools.length + deferredTools.length).toBe(64);
+      expect(alwaysTools.length + deferredTools.length).toBe(74);
     });
   });
 });

package/tests/test-lane-manifest.ts

@@ -46,6 +46,10 @@ const UNIT_ALLOWLIST = new Set([
   "tests/executors/conversation-primitives.test.ts",
   "tests/executors/deploy.test.ts",
   "tests/executors/filesystem-tools.test.ts",
+  "tests/executors/frg.test.ts",
+  "tests/executors/frg-freshness.test.ts",
+  "tests/executors/frg-merge.test.ts",
+  "tests/executors/frg-session-content.test.ts",
   "tests/executors/filesystem.test.ts",
   "tests/executors/memory-bugfixes.test.ts",
   "tests/executors/memory.test.ts",

package/tsconfig.cjs.json

@@ -11,6 +11,14 @@
     "tsBuildInfoFile": "./dist-cjs/.tsbuildinfo"
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "dist-cjs", "tests", "**/*.test.ts", "**/*.test.tsx"],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "dist-cjs",
+    "tests",
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "src/executors/lsp-client.ts"
+  ],
   "references": [{ "path": "../types" }]
 }

package/tsconfig.json

@@ -8,5 +8,5 @@
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "tests", "**/*.test.ts", "**/*.test.tsx"],
-  "references": [{ "path": "../types" }]
+  "references": [{ "path": "../types" }, { "path": "../fastripgrep" }]
 }