arisa 5.1.12 → 5.1.24

package/test/tool-dependencies.test.js

@@ -0,0 +1,53 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  inspectToolDependencies,
+  normalizeToolDependencies,
+  resolveToolDependencyPlan,
+  satisfiesToolVersion
+} from "../src/core/tools/tool-dependencies.js";
+
+test("normalizes strict tool dependency maps and supports exact and caret versions", () => {
+  assert.deepEqual(normalizeToolDependencies({ "mcp-client": "^0.1.0" }), { "mcp-client": "^0.1.0" });
+  assert.equal(satisfiesToolVersion("0.1.9", "^0.1.0"), true);
+  assert.equal(satisfiesToolVersion("0.2.0", "^0.1.0"), false);
+  assert.equal(satisfiesToolVersion("1.4.0", "^1.2.3"), true);
+  assert.equal(satisfiesToolVersion("2.0.0", "^1.2.3"), false);
+  assert.throws(() => normalizeToolDependencies({ "../bad": "^1.0.0" }), /Invalid tool dependency name/);
+  assert.throws(() => normalizeToolDependencies({ valid: ">=1.0.0" }), /Unsupported tool dependency range/);
+});
+
+test("resolves dependencies before dependents and detects invalid graphs", () => {
+  const entries = {
+    "mcp-client": { version: "0.1.0", toolDependencies: {} },
+    "magnific-mcp": { version: "0.1.0", toolDependencies: { "mcp-client": "^0.1.0" } }
+  };
+  assert.deepEqual(resolveToolDependencyPlan(entries, "magnific-mcp"), ["mcp-client", "magnific-mcp"]);
+  assert.throws(
+    () => resolveToolDependencyPlan({ a: { version: "1.0.0", toolDependencies: { b: "^1.0.0" } } }, "a"),
+    /not locked/
+  );
+  assert.throws(
+    () => resolveToolDependencyPlan({
+      a: { version: "1.0.0", toolDependencies: { b: "^1.0.0" } },
+      b: { version: "1.0.0", toolDependencies: { a: "^1.0.0" } }
+    }, "a"),
+    /Circular/
+  );
+});
+
+test("reports missing and incompatible installed tool dependencies", () => {
+  const tools = new Map([
+    ["magnific-mcp", { name: "magnific-mcp", version: "0.1.0", toolDependencies: { "mcp-client": "^0.1.0" } }]
+  ]);
+  assert.deepEqual(inspectToolDependencies(tools), [{
+    tool: "magnific-mcp",
+    type: "missing",
+    dependency: "mcp-client",
+    range: "^0.1.0"
+  }]);
+  tools.set("mcp-client", { name: "mcp-client", version: "0.2.0", toolDependencies: {} });
+  assert.equal(inspectToolDependencies(tools)[0].type, "incompatible");
+  tools.get("mcp-client").version = "0.1.4";
+  assert.deepEqual(inspectToolDependencies(tools), []);
+});

package/test/tool-registry-run.test.js

@@ -104,6 +104,7 @@ test("loads and lists installed tools from the user tools directory", async () =
     version: null,
     packageDigest: null,
     requirements: [],
+    toolDependencies: {},
     description: "Fake test tool",
     input: ["text/plain"],
     output: ["text/plain"],
@@ -144,6 +145,23 @@ test("shows semantic metadata in tool help", async () => {
   assert.match(help, /Assigned skills:/);
 });
 
+test("reports dependency status in help and blocks a tool with a missing dependency", async () => {
+  await resetHome();
+  await createFakeTool("dependent-tool", {
+    version: "1.0.0",
+    toolDependencies: { "base-tool": "^1.0.0" }
+  });
+
+  const registry = new ToolRegistry();
+  await registry.load();
+
+  assert.match(await registry.help("dependent-tool"), /base-tool@\^1\.0\.0: missing/);
+  await assert.rejects(
+    () => registry.run({ name: "dependent-tool", request: { args: {} } }),
+    /Tool dependency missing/
+  );
+});
+
 test("runs a registered tool process with an enriched request and cleans up request files", async () => {
   await resetHome();
   await createFakeTool("fake-tool");
@@ -178,7 +196,7 @@ test("runs a registered tool process with an enriched request and cleans up requ
   });
   assert.equal(result.output.env.ARISA_PACKAGE_DIR, arisaPackageDir);
   assert.equal(result.output.env.ARISA_IPC_SOCKET, arisaIpcSocketFile);
-  assert.deepEqual(await registry.usage("chat-1"), [{ name: "fake-tool", count: 1 }]);
+  assert.deepEqual(await registry.usage("chat-1"), [{ name: "fake-tool", count: 1, official: false }]);
 
   const requestFile = result.output.requestFile;
   await assert.rejects(() => access(requestFile), { code: "ENOENT" });

package/test/tool-usage.test.js

@@ -3,6 +3,7 @@ import { mkdtemp, rm } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import test from "node:test";
+import { ToolRegistry } from "../src/core/tools/tool-registry.js";
 import { ToolUsageStore } from "../src/core/tools/tool-usage-store.js";
 import { formatToolUsageReport } from "../src/runtime/tool-usage-report.js";
 
@@ -26,16 +27,37 @@ test("counts concurrent tool uses per chat", async () => {
   }
 });
 
+test("reports recorded usage for local tools not present in the startup registry", async () => {
+  const registry = new ToolRegistry({
+    usageStore: {
+      counts: async () => ({ "creator-scout": 4 })
+    },
+    resolveOfficialToolNames: async () => new Set(["gmail-workspace"])
+  });
+  registry.tools.set("gmail-workspace", {
+    name: "gmail-workspace",
+    input: ["application/json"],
+    output: ["application/json"]
+  });
+
+  assert.deepEqual(await registry.usage("chat-1"), [
+    { name: "creator-scout", count: 4, official: false },
+    { name: "gmail-workspace", count: 0, official: true }
+  ]);
+});
+
 test("formats narrow tool usage counts with bullets and right-aligned numbers", () => {
   const report = formatToolUsageReport([
-    { name: "gmail-workspace", count: 3 },
-    { name: "campaign-draft-runner", count: 12 }
+    { name: "gmail-workspace", count: 3, official: true },
+    { name: "campaign-draft-runner", count: 12, official: false }
   ]);
+  assert.match(report, /Official\n- gmail-workspace/);
+  assert.match(report, /Local\n- campaign-draft-runner/);
   assert.match(report, /- campaign-draft-runner  12/);
   assert.match(report, /- gmail-workspace\s+3/);
   const rows = report.split("\n").filter((line) => line.startsWith("- "));
-  assert.match(rows[0], /campaign-draft-runner/);
-  assert.match(rows[1], /gmail-workspace/);
+  assert.match(rows[0], /gmail-workspace/);
+  assert.match(rows[1], /campaign-draft-runner/);
   assert.deepEqual(rows.map((line) => line.match(/\d+$/).index + line.match(/\d+$/)[0].length), [27, 27]);
   assert.deepEqual(rows.map((line) => line.length), [27, 27]);
   assert.ok(report.split("\n").every((line) => [...line].length <= 35));