@agentrq/acp-gateway 0.2.27 → 0.2.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -37,7 +37,7 @@ npm install -g @agentrq/acp-gateway
37
37
 
38
38
  ## Current Version
39
39
 
40
- `0.2.27`
40
+ `0.2.29`
41
41
 
42
42
  ## Usage
43
43
 
@@ -0,0 +1,76 @@
1
+ import { describe, it, expect } from "vitest";
2
+ import { BoundedMap, FifoQueue } from "../collections.js";
3
+ describe("BoundedMap", () => {
4
+ it("rejects a capacity that could hold nothing", () => {
5
+ expect(() => new BoundedMap(0)).toThrow(RangeError);
6
+ expect(() => new BoundedMap(1.5)).toThrow(RangeError);
7
+ });
8
+ it("evicts the least recently written entry once full", () => {
9
+ const map = new BoundedMap(2);
10
+ map.set("a", 1).set("b", 2).set("c", 3);
11
+ expect([...map.keys()]).toEqual(["b", "c"]);
12
+ });
13
+ it("treats rewriting a key as fresh use", () => {
14
+ const map = new BoundedMap(2);
15
+ map.set("a", 1).set("b", 2).set("a", 10).set("c", 3);
16
+ expect([...map.entries()]).toEqual([
17
+ ["a", 10],
18
+ ["c", 3],
19
+ ]);
20
+ });
21
+ it("does not count reads as use", () => {
22
+ const map = new BoundedMap(2);
23
+ map.set("a", 1).set("b", 2);
24
+ map.get("a");
25
+ map.set("c", 3);
26
+ expect(map.has("a")).toBe(false);
27
+ });
28
+ it("keeps the rest of the Map interface", () => {
29
+ const map = new BoundedMap(3);
30
+ map.set("a", 1);
31
+ expect(map).toBeInstanceOf(Map);
32
+ expect(map.delete("a")).toBe(true);
33
+ expect(map.size).toBe(0);
34
+ });
35
+ });
36
+ describe("FifoQueue", () => {
37
+ it("returns undefined when empty", () => {
38
+ const queue = new FifoQueue();
39
+ expect(queue.length).toBe(0);
40
+ expect(queue.shift()).toBeUndefined();
41
+ });
42
+ it("hands items back in the order they arrived, across compactions", () => {
43
+ const queue = new FifoQueue();
44
+ const out = [];
45
+ for (let i = 0; i < 10; i++)
46
+ queue.push(i);
47
+ for (let i = 0; i < 7; i++)
48
+ out.push(queue.shift());
49
+ expect(queue.length).toBe(3);
50
+ for (let i = 10; i < 15; i++)
51
+ queue.push(i);
52
+ while (queue.length > 0)
53
+ out.push(queue.shift());
54
+ expect(out).toEqual(Array.from({ length: 15 }, (_, i) => i));
55
+ expect(queue.shift()).toBeUndefined();
56
+ });
57
+ it("is reusable after being drained", () => {
58
+ const queue = new FifoQueue();
59
+ queue.push("a");
60
+ expect(queue.shift()).toBe("a");
61
+ queue.push("b");
62
+ expect(queue.length).toBe(1);
63
+ expect(queue.shift()).toBe("b");
64
+ });
65
+ it("drains a large backlog in order", () => {
66
+ const queue = new FifoQueue();
67
+ const n = 200_000;
68
+ for (let i = 0; i < n; i++)
69
+ queue.push(i);
70
+ let sum = 0;
71
+ for (let i = 0; i < n; i++)
72
+ sum += queue.shift();
73
+ expect(sum).toBe((n * (n - 1)) / 2);
74
+ });
75
+ });
76
+ //# sourceMappingURL=collections.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"collections.test.js","sourceRoot":"","sources":["../../src/__tests__/collections.test.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ import { join } from "node:path";
6
6
  import { EventEmitter } from "node:events";
7
7
  import * as acp from "@agentclientprotocol/sdk";
8
8
  import { createAcpSessionSwitcher, fetchNextTask, startPendingTask, drainPendingTasks, createSelfFillingTaskQueue, MAX_SKIPPED_FETCHES, IDLE_TASK_POLL_INTERVAL_MS, freeSlots, resetPendingTaskDrain, mapMcpServers, TaskQueue, createTaskQueue, resetConcurrencyReports, getOrCreateSession, openIdleSession, resetIdleSession, activeSessions, AuthenticationFailed, IDLE_SESSION_KEY, loginCommandFor, authConfig, modelConfig, createSessionWithAuth, isInteractiveTerminal, openAgentConnection, agentExitFailed, showAgentStderr, shouldPrintBanner, parseGatewayArgs, assertAgentRunnable, helpText, isRunnable, resolveOnPath, spawnTarget, needsShell, escapeCmdCommand, quoteForCmd, spawnArgsFor, terminateAgentProcess, printHelp, resolveAgentCommand, runListAgents, pickHumanApprovalMode, enforceHumanApprovalMode, handleAgentModeChange, runAgentCommand, loadWorkspace, createDetachedBridge, makeIsolatedDir, WORKSPACE_OPTIONAL_COMMANDS, findActiveSession, handleTaskCancellation, handleSetModel, handleSetConcurrency, runTurnForTask, resetTaskTurns, registerConcurrencyListeners, reportConcurrency, applyModelSelection, cancelledTaskSeq, markTaskCancelled, isTaskCancelled, nextTaskSeq, supportsCloseSession, closeSession, closeAllSessions, setupSignalHandlers, } from "../index.js";
9
- import { sendModelsNotification } from "../acpClient.js";
9
+ import { AgentRQACPClient, sendModelsNotification } from "../acpClient.js";
10
10
  import { AUTH_REQUIRED_CODE } from "../auth.js";
11
11
  /**
12
12
  * A stand-in for the workspace bridge.
@@ -2689,7 +2689,7 @@ describe("index", () => {
2689
2689
  const workspace = loadWorkspace("list-models", file, emptyWorkspaceDir());
2690
2690
  expect(workspace.agentrqConfig.name).toBe("agentrq-ws");
2691
2691
  expect(workspace.mcpBridge.getServerName()).toBeUndefined();
2692
- await expect(workspace.mcpBridge.sendNotification("notifications/claude/channel/models", {})).rejects.toThrow("No agentrq workspace is configured");
2692
+ await expect(workspace.mcpBridge.callTool("elicit", {})).rejects.toThrow("No agentrq workspace is configured");
2693
2693
  });
2694
2694
  it("should still report a --mcp-json path that is wrong", () => {
2695
2695
  expect(() => loadWorkspace("list-models", "/nowhere/servers.json", emptyWorkspaceDir())).toThrow();
@@ -2717,15 +2717,28 @@ describe("index", () => {
2717
2717
  });
2718
2718
  });
2719
2719
  describe("createDetachedBridge", () => {
2720
- it("should fail whatever is asked of the workspace, and close quietly", async () => {
2720
+ it("should fail tool calls, drop notifications, and close quietly", async () => {
2721
2721
  const bridge = createDetachedBridge();
2722
2722
  await expect(bridge.callTool("elicit", {})).rejects.toThrow("No agentrq workspace is configured");
2723
- await expect(bridge.sendNotification("notifications/x", {})).rejects.toThrow("No agentrq workspace is configured");
2723
+ await expect(bridge.sendNotification("notifications/x", {})).resolves.toBeUndefined();
2724
2724
  expect(bridge.getSessionId()).toBeUndefined();
2725
2725
  expect(bridge.getServerName()).toBeUndefined();
2726
2726
  expect(bridge.getAdvertisedTools()).toBeUndefined();
2727
2727
  await expect(bridge.close()).resolves.toBeUndefined();
2728
2728
  });
2729
+ it("should not print an error when the agent shares its slash commands", async () => {
2730
+ const errorSpy = vi.spyOn(console, "error").mockImplementation(() => { });
2731
+ const client = new AgentRQACPClient(createDetachedBridge());
2732
+ await client.sessionUpdate({
2733
+ sessionId: "s1",
2734
+ update: {
2735
+ sessionUpdate: "available_commands_update",
2736
+ availableCommands: [{ name: "init", description: "d" }],
2737
+ },
2738
+ });
2739
+ expect(errorSpy).not.toHaveBeenCalled();
2740
+ errorSpy.mockRestore();
2741
+ });
2729
2742
  });
2730
2743
  describe("runAgentCommand", () => {
2731
2744
  const agentrqConfig = { env: {} };