@agentrq/acp-gateway 0.4.2 → 0.4.4
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 +1 -1
- package/dist/__tests__/log.test.js +28 -1
- package/dist/__tests__/log.test.js.map +1 -1
- package/dist/__tests__/native.test.js +451 -0
- package/dist/__tests__/native.test.js.map +1 -1
- package/dist/__tests__/nativeFrames.test.js +16 -2
- package/dist/__tests__/nativeFrames.test.js.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/log.js +23 -0
- package/dist/log.js.map +1 -1
- package/dist/native.js +259 -17
- package/dist/native.js.map +1 -1
- package/dist/nativeFrames.js +31 -7
- package/dist/nativeFrames.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
2
2
|
import { PassThrough } from "node:stream";
|
|
3
|
-
import { AGENT_STDERR_TAIL_LENGTH, debug, followAgentStderr, isVerbose, setVerbose, showingAgentStderr, } from "../log.js";
|
|
3
|
+
import { AGENT_STDERR_TAIL_LENGTH, TASK_PREVIEW_LENGTH, announceFinished, announceTask, debug, describeAsk, followAgentStderr, isVerbose, setVerbose, showingAgentStderr, } from "../log.js";
|
|
4
4
|
describe("log", () => {
|
|
5
5
|
let errorSpy;
|
|
6
6
|
beforeEach(() => {
|
|
@@ -29,6 +29,33 @@ describe("log", () => {
|
|
|
29
29
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
30
30
|
});
|
|
31
31
|
});
|
|
32
|
+
describe("describeAsk", () => {
|
|
33
|
+
it("names the task id when one is given", () => {
|
|
34
|
+
expect(describeAsk("Fix the build", "42")).toBe("[task 42] Fix the build");
|
|
35
|
+
});
|
|
36
|
+
it("leaves out the id when none is given", () => {
|
|
37
|
+
expect(describeAsk("Fix the build")).toBe("[task] Fix the build");
|
|
38
|
+
});
|
|
39
|
+
it("collapses line breaks and whitespace onto one line", () => {
|
|
40
|
+
expect(describeAsk(" first line\n\n second\tline ", "7")).toBe("[task 7] first line second line");
|
|
41
|
+
});
|
|
42
|
+
it("cuts off prompts longer than the preview limit", () => {
|
|
43
|
+
const long = "a".repeat(TASK_PREVIEW_LENGTH + 50);
|
|
44
|
+
expect(describeAsk(long, "1")).toBe(`[task 1] ${"a".repeat(TASK_PREVIEW_LENGTH)}…`);
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
describe("announceTask and announceFinished", () => {
|
|
48
|
+
it("prints the task summary and completion even without --verbose", () => {
|
|
49
|
+
announceTask("Deploy staging", "99");
|
|
50
|
+
announceFinished("99", "end_turn");
|
|
51
|
+
announceFinished(undefined, "cancelled");
|
|
52
|
+
expect(errorSpy.mock.calls).toEqual([
|
|
53
|
+
["\n[task 99] Deploy staging"],
|
|
54
|
+
["[task 99] Finished: end_turn"],
|
|
55
|
+
["[task] Finished: cancelled"],
|
|
56
|
+
]);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
32
59
|
});
|
|
33
60
|
describe("followAgentStderr", () => {
|
|
34
61
|
afterEach(() => setVerbose(false));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.test.js","sourceRoot":"","sources":["../../src/__tests__/log.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"log.test.js","sourceRoot":"","sources":["../../src/__tests__/log.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1029,5 +1029,456 @@ describe("runNative", () => {
|
|
|
1029
1029
|
await flush();
|
|
1030
1030
|
expect(t.exit).not.toHaveBeenCalled();
|
|
1031
1031
|
});
|
|
1032
|
+
it("prints non-verbose summaries for connection, agent readiness, tasks, permissions, elicitations, and turn completion", async () => {
|
|
1033
|
+
const t = await connected();
|
|
1034
|
+
expect(printed()).toContain("[acp-gateway] Connected to AgentRQ; waiting for tasks...");
|
|
1035
|
+
// 1. Agent initialization summary
|
|
1036
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "init-1", method: "initialize", params: {} }));
|
|
1037
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1038
|
+
jsonrpc: "2.0",
|
|
1039
|
+
id: "init-1",
|
|
1040
|
+
result: { agentInfo: { title: "Gemini CLI", version: "1.2.3" } },
|
|
1041
|
+
}) + "\n");
|
|
1042
|
+
await flush();
|
|
1043
|
+
expect(printed()).toContain("[acp-gateway] Agent ready: Gemini CLI v1.2.3");
|
|
1044
|
+
// 2. Incoming task prompt announcement
|
|
1045
|
+
t.ws().receive(JSON.stringify({
|
|
1046
|
+
jsonrpc: "2.0",
|
|
1047
|
+
id: 10,
|
|
1048
|
+
method: "session/prompt",
|
|
1049
|
+
params: {
|
|
1050
|
+
sessionId: "s-1",
|
|
1051
|
+
prompt: [{ type: "text", text: "[Task 0lzWBUu5TV2]\nShare summaries when not in verbose mode" }],
|
|
1052
|
+
},
|
|
1053
|
+
}));
|
|
1054
|
+
expect(printed()).toContain("[task 0lzWBUu5TV2] Share summaries when not in verbose mode");
|
|
1055
|
+
// 3. Tool call title remembered from session/update + permission request + verdict
|
|
1056
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1057
|
+
jsonrpc: "2.0",
|
|
1058
|
+
method: "session/update",
|
|
1059
|
+
params: {
|
|
1060
|
+
sessionId: "s-1",
|
|
1061
|
+
update: { sessionUpdate: "tool_call", toolCallId: "tc-1", title: "Run npm test" },
|
|
1062
|
+
},
|
|
1063
|
+
}) + "\n");
|
|
1064
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1065
|
+
jsonrpc: "2.0",
|
|
1066
|
+
id: "perm-1",
|
|
1067
|
+
method: "session/request_permission",
|
|
1068
|
+
params: {
|
|
1069
|
+
sessionId: "s-1",
|
|
1070
|
+
toolCall: { toolCallId: "tc-1" },
|
|
1071
|
+
options: [{ optionId: "allow-once", kind: "allow_once", name: "Allow" }],
|
|
1072
|
+
},
|
|
1073
|
+
}) + "\n");
|
|
1074
|
+
await flush();
|
|
1075
|
+
expect(printed()).toContain("🔐 ACP Permission requested: Run npm test (ID: tc-1)");
|
|
1076
|
+
expect(printed()).toContain("⌛ Waiting for human approval in the agentrq dashboard...");
|
|
1077
|
+
t.ws().receive(JSON.stringify({
|
|
1078
|
+
jsonrpc: "2.0",
|
|
1079
|
+
id: "perm-1",
|
|
1080
|
+
result: { outcome: { outcome: "selected", optionId: "allow-once" } },
|
|
1081
|
+
}));
|
|
1082
|
+
expect(printed()).toContain("✅ Permission verdict received: allow-once");
|
|
1083
|
+
// Permission request with explicit title, explicit name, no toolCallId, and cancelled outcome
|
|
1084
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1085
|
+
jsonrpc: "2.0",
|
|
1086
|
+
id: "perm-title",
|
|
1087
|
+
method: "session/request_permission",
|
|
1088
|
+
params: {
|
|
1089
|
+
sessionId: "s-1",
|
|
1090
|
+
toolCall: { title: "Explicit Title" },
|
|
1091
|
+
},
|
|
1092
|
+
}) + "\n");
|
|
1093
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1094
|
+
jsonrpc: "2.0",
|
|
1095
|
+
id: "perm-2",
|
|
1096
|
+
method: "session/request_permission",
|
|
1097
|
+
params: {
|
|
1098
|
+
sessionId: "s-1",
|
|
1099
|
+
toolCall: { name: "WriteFile" },
|
|
1100
|
+
},
|
|
1101
|
+
}) + "\n");
|
|
1102
|
+
await flush();
|
|
1103
|
+
expect(printed()).toContain("🔐 ACP Permission requested: Explicit Title");
|
|
1104
|
+
expect(printed()).toContain("🔐 ACP Permission requested: WriteFile");
|
|
1105
|
+
t.ws().receive(JSON.stringify({
|
|
1106
|
+
jsonrpc: "2.0",
|
|
1107
|
+
id: "perm-2",
|
|
1108
|
+
result: { outcome: { outcome: "cancelled" } },
|
|
1109
|
+
}));
|
|
1110
|
+
expect(printed()).toContain("✅ Permission verdict received: cancelled");
|
|
1111
|
+
// Permission request with fallback Unknown Tool and response without outcome
|
|
1112
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1113
|
+
jsonrpc: "2.0",
|
|
1114
|
+
id: "perm-3",
|
|
1115
|
+
method: "session/request_permission",
|
|
1116
|
+
params: { sessionId: "s-1" },
|
|
1117
|
+
}) + "\n");
|
|
1118
|
+
await flush();
|
|
1119
|
+
expect(printed()).toContain("🔐 ACP Permission requested: Unknown Tool");
|
|
1120
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "perm-3", result: {} }));
|
|
1121
|
+
// 4. Elicitation request (with explicit mode/message and with defaults)
|
|
1122
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1123
|
+
jsonrpc: "2.0",
|
|
1124
|
+
id: "elicit-1",
|
|
1125
|
+
method: "elicitation/create",
|
|
1126
|
+
params: { sessionId: "s-1", mode: "url", message: "Authenticate with GitHub" },
|
|
1127
|
+
}) + "\n");
|
|
1128
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1129
|
+
jsonrpc: "2.0",
|
|
1130
|
+
id: "elicit-2",
|
|
1131
|
+
method: "elicitation/create",
|
|
1132
|
+
params: { sessionId: "s-1" },
|
|
1133
|
+
}) + "\n");
|
|
1134
|
+
await flush();
|
|
1135
|
+
expect(printed()).toContain("[acp] Elicitation requested (mode=url): Authenticate with GitHub");
|
|
1136
|
+
expect(printed()).toContain("[acp] Elicitation requested (mode=form): ");
|
|
1137
|
+
// 5. Turn completion summary
|
|
1138
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1139
|
+
jsonrpc: "2.0",
|
|
1140
|
+
id: 10,
|
|
1141
|
+
result: { stopReason: "end_turn" },
|
|
1142
|
+
}) + "\n");
|
|
1143
|
+
await flush();
|
|
1144
|
+
expect(printed()).toContain("[task 0lzWBUu5TV2] Finished: end_turn");
|
|
1145
|
+
});
|
|
1146
|
+
it("handles prompt error responses, cancelled prompts, and fallback agent labels", async () => {
|
|
1147
|
+
const t = await start({ agentId: "", acpCmdArgs: [""] });
|
|
1148
|
+
t.ws().open();
|
|
1149
|
+
t.ws().welcome({ connectionId: "AB" });
|
|
1150
|
+
// Initialize with empty agentInfo and empty agentId/acpCmdArgs fallback
|
|
1151
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: 1, method: "initialize", params: {} }));
|
|
1152
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: 1, result: {} }) + "\n");
|
|
1153
|
+
await flush();
|
|
1154
|
+
expect(printed()).toContain("[acp-gateway] Agent ready");
|
|
1155
|
+
// Prompt that errors with message, code, or unknown
|
|
1156
|
+
t.ws().receive(JSON.stringify({
|
|
1157
|
+
jsonrpc: "2.0",
|
|
1158
|
+
id: 20,
|
|
1159
|
+
method: "session/prompt",
|
|
1160
|
+
params: { sessionId: "s-1", prompt: [{ type: "text", text: "plain task" }] },
|
|
1161
|
+
}));
|
|
1162
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1163
|
+
jsonrpc: "2.0",
|
|
1164
|
+
id: 20,
|
|
1165
|
+
error: { code: -32603, message: "rate limited" },
|
|
1166
|
+
}) + "\n");
|
|
1167
|
+
t.ws().receive(JSON.stringify({
|
|
1168
|
+
jsonrpc: "2.0",
|
|
1169
|
+
id: 21,
|
|
1170
|
+
method: "session/prompt",
|
|
1171
|
+
params: { sessionId: "s-1", prompt: [{ type: "text", text: "second task" }] },
|
|
1172
|
+
}));
|
|
1173
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1174
|
+
jsonrpc: "2.0",
|
|
1175
|
+
id: 21,
|
|
1176
|
+
error: { code: -32001 },
|
|
1177
|
+
}) + "\n");
|
|
1178
|
+
t.ws().receive(JSON.stringify({
|
|
1179
|
+
jsonrpc: "2.0",
|
|
1180
|
+
id: 22,
|
|
1181
|
+
method: "session/prompt",
|
|
1182
|
+
params: { sessionId: "s-1", prompt: [{ type: "text", text: "third task" }] },
|
|
1183
|
+
}));
|
|
1184
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1185
|
+
jsonrpc: "2.0",
|
|
1186
|
+
id: 22,
|
|
1187
|
+
error: {},
|
|
1188
|
+
}) + "\n");
|
|
1189
|
+
// Prompt that returns neither stopReason nor error, or is cancelled via $/cancel_request
|
|
1190
|
+
t.ws().receive(JSON.stringify({
|
|
1191
|
+
jsonrpc: "2.0",
|
|
1192
|
+
id: 23,
|
|
1193
|
+
method: "session/prompt",
|
|
1194
|
+
params: { sessionId: "s-1", prompt: [{ type: "text", text: "fourth task" }] },
|
|
1195
|
+
}));
|
|
1196
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: 23, result: {} }) + "\n");
|
|
1197
|
+
t.ws().receive(JSON.stringify({
|
|
1198
|
+
jsonrpc: "2.0",
|
|
1199
|
+
id: 24,
|
|
1200
|
+
method: "session/prompt",
|
|
1201
|
+
params: { sessionId: "s-1", prompt: [{ type: "text", text: "cancelled task" }] },
|
|
1202
|
+
}));
|
|
1203
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", method: "$/cancel_request", params: { requestId: 24 } }));
|
|
1204
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: 24, result: { stopReason: "cancelled" } }) + "\n");
|
|
1205
|
+
await flush();
|
|
1206
|
+
expect(printed()).toContain("[task] Finished: error (rate limited)");
|
|
1207
|
+
expect(printed()).toContain("[task] Finished: error (-32001)");
|
|
1208
|
+
expect(printed()).toContain("[task] Finished: error (unknown)");
|
|
1209
|
+
expect(printed()).not.toContain("Finished: cancelled");
|
|
1210
|
+
});
|
|
1211
|
+
it("streams the agent's stderr during authenticate and relays a loopback OAuth redirect when interactive", async () => {
|
|
1212
|
+
const write = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
|
|
1213
|
+
let resolveAsk;
|
|
1214
|
+
const askUntil = vi.fn((_q, signal) => new Promise((resolve, reject) => {
|
|
1215
|
+
resolveAsk = resolve;
|
|
1216
|
+
signal.addEventListener("abort", () => reject(new Error("aborted")));
|
|
1217
|
+
}));
|
|
1218
|
+
const t = await start({ askUntil });
|
|
1219
|
+
t.ws().open();
|
|
1220
|
+
t.ws().welcome({ connectionId: "AB" });
|
|
1221
|
+
// AgentRQ sends an authenticate request
|
|
1222
|
+
t.ws().receive(JSON.stringify({
|
|
1223
|
+
jsonrpc: "2.0",
|
|
1224
|
+
id: "auth-1",
|
|
1225
|
+
method: "authenticate",
|
|
1226
|
+
params: { methodId: "google-login" },
|
|
1227
|
+
}));
|
|
1228
|
+
expect(printed()).toContain("[auth] The agent requires authentication (google-login); waiting for sign-in...");
|
|
1229
|
+
// While authenticate is in flight, agent stderr is forwarded even without --verbose
|
|
1230
|
+
const oauthLine = "Open the following link: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43123%2Foauth-callback\n";
|
|
1231
|
+
t.children[0].stderr.write(oauthLine);
|
|
1232
|
+
await flush();
|
|
1233
|
+
expect(write).toHaveBeenCalledWith(oauthLine);
|
|
1234
|
+
expect(printed()).toContain("Signing in from a browser on another computer?");
|
|
1235
|
+
expect(askUntil).toHaveBeenCalledTimes(1);
|
|
1236
|
+
// Additional stderr chunk while already relaying does not start a second relay
|
|
1237
|
+
t.children[0].stderr.write("still waiting...\n");
|
|
1238
|
+
await flush();
|
|
1239
|
+
expect(askUntil).toHaveBeenCalledTimes(1);
|
|
1240
|
+
// Agent finishes authentication on its own (or after redirect), aborting askUntil
|
|
1241
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "auth-1", result: {} }) + "\n");
|
|
1242
|
+
await flush();
|
|
1243
|
+
expect(printed()).toContain('[auth] Logged in with "google-login".');
|
|
1244
|
+
// Once authenticate is complete, stderr is no longer forwarded in non-verbose mode
|
|
1245
|
+
write.mockClear();
|
|
1246
|
+
t.children[0].stderr.write("quiet again\n");
|
|
1247
|
+
await flush();
|
|
1248
|
+
expect(write).not.toHaveBeenCalled();
|
|
1249
|
+
// Authenticate with default methodId and error responses (message, code, unknown)
|
|
1250
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "auth-2", method: "authenticate", params: {} }));
|
|
1251
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "auth-3", method: "authenticate", params: { methodId: "oauth" } }));
|
|
1252
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "auth-2", error: { code: -32000, message: "denied" } }) + "\n");
|
|
1253
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "auth-3", error: { code: -32001 } }) + "\n");
|
|
1254
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "auth-4", method: "authenticate", params: { methodId: "oauth" } }));
|
|
1255
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "auth-4", error: {} }) + "\n");
|
|
1256
|
+
await flush();
|
|
1257
|
+
expect(printed()).toContain("[auth] Authentication failed (default): denied");
|
|
1258
|
+
expect(printed()).toContain("[auth] Authentication failed (oauth): -32001");
|
|
1259
|
+
expect(printed()).toContain("[auth] Authentication failed (oauth): unknown");
|
|
1260
|
+
write.mockRestore();
|
|
1261
|
+
void resolveAsk;
|
|
1262
|
+
});
|
|
1263
|
+
it("cancels an in-flight OAuth relay prompt immediately when the agent exits", async () => {
|
|
1264
|
+
const write = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
|
|
1265
|
+
let capturedSignal;
|
|
1266
|
+
const askUntil = vi.fn((_q, signal) => new Promise((_resolve, reject) => {
|
|
1267
|
+
capturedSignal = signal;
|
|
1268
|
+
signal.addEventListener("abort", () => reject(new Error("aborted")));
|
|
1269
|
+
}));
|
|
1270
|
+
const t = await start({ askUntil });
|
|
1271
|
+
t.ws().open();
|
|
1272
|
+
t.ws().welcome({ connectionId: "AB" });
|
|
1273
|
+
t.ws().receive(JSON.stringify({
|
|
1274
|
+
jsonrpc: "2.0",
|
|
1275
|
+
id: "auth-exit",
|
|
1276
|
+
method: "authenticate",
|
|
1277
|
+
params: { methodId: "google-login" },
|
|
1278
|
+
}));
|
|
1279
|
+
t.children[0].stderr.write("Open: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43123%2Fcb\n");
|
|
1280
|
+
await flush();
|
|
1281
|
+
expect(askUntil).toHaveBeenCalledTimes(1);
|
|
1282
|
+
expect(capturedSignal?.aborted).toBe(false);
|
|
1283
|
+
// Agent exits before respawn delay completes: auth prompt must abort immediately, not stay open during backoff.
|
|
1284
|
+
t.children[0].emit("exit", 1, null);
|
|
1285
|
+
await flush();
|
|
1286
|
+
expect(capturedSignal?.aborted).toBe(true);
|
|
1287
|
+
write.mockRestore();
|
|
1288
|
+
});
|
|
1289
|
+
it("bounds remembered tool call titles with LRU eviction", async () => {
|
|
1290
|
+
const t = await connected();
|
|
1291
|
+
for (let i = 0; i < 1024; i++) {
|
|
1292
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1293
|
+
jsonrpc: "2.0",
|
|
1294
|
+
method: "session/update",
|
|
1295
|
+
params: {
|
|
1296
|
+
sessionId: "s-1",
|
|
1297
|
+
update: { sessionUpdate: "tool_call", toolCallId: `tc-${i}`, title: `Tool ${i}` },
|
|
1298
|
+
},
|
|
1299
|
+
}) + "\n");
|
|
1300
|
+
}
|
|
1301
|
+
// Refresh tc-0 so tc-1 becomes the least-recently-used entry, then insert a 1025th entry.
|
|
1302
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1303
|
+
jsonrpc: "2.0",
|
|
1304
|
+
method: "session/update",
|
|
1305
|
+
params: {
|
|
1306
|
+
sessionId: "s-1",
|
|
1307
|
+
update: { sessionUpdate: "tool_call_update", toolCallId: "tc-0", title: "Refreshed Tool 0" },
|
|
1308
|
+
},
|
|
1309
|
+
}) + "\n");
|
|
1310
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1311
|
+
jsonrpc: "2.0",
|
|
1312
|
+
method: "session/update",
|
|
1313
|
+
params: {
|
|
1314
|
+
sessionId: "s-1",
|
|
1315
|
+
update: { sessionUpdate: "tool_call", toolCallId: "tc-1024", title: "Tool 1024" },
|
|
1316
|
+
},
|
|
1317
|
+
}) + "\n");
|
|
1318
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1319
|
+
jsonrpc: "2.0",
|
|
1320
|
+
id: "perm-evicted",
|
|
1321
|
+
method: "session/request_permission",
|
|
1322
|
+
params: { sessionId: "s-1", toolCall: { toolCallId: "tc-1" } },
|
|
1323
|
+
}) + "\n");
|
|
1324
|
+
t.children[0].stdout.write(JSON.stringify({
|
|
1325
|
+
jsonrpc: "2.0",
|
|
1326
|
+
id: "perm-kept",
|
|
1327
|
+
method: "session/request_permission",
|
|
1328
|
+
params: { sessionId: "s-1", toolCall: { toolCallId: "tc-0" } },
|
|
1329
|
+
}) + "\n");
|
|
1330
|
+
await flush();
|
|
1331
|
+
expect(printed()).toContain("🔐 ACP Permission requested: Unknown Tool (ID: tc-1)");
|
|
1332
|
+
expect(printed()).toContain("🔐 ACP Permission requested: Refreshed Tool 0 (ID: tc-0)");
|
|
1333
|
+
});
|
|
1334
|
+
it("surfaces loopback OAuth stderr during session/new and relays when interactive", async () => {
|
|
1335
|
+
const write = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
|
|
1336
|
+
let capturedSignal;
|
|
1337
|
+
const askUntil = vi.fn((_q, signal) => new Promise((_resolve, reject) => {
|
|
1338
|
+
capturedSignal = signal;
|
|
1339
|
+
signal.addEventListener("abort", () => reject(new Error("aborted")));
|
|
1340
|
+
}));
|
|
1341
|
+
const t = await start({ askUntil });
|
|
1342
|
+
t.ws().open();
|
|
1343
|
+
t.ws().welcome({ connectionId: "AB" });
|
|
1344
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-1", method: "session/new", params: { mcpServers: [] } }));
|
|
1345
|
+
await flush();
|
|
1346
|
+
// Partial chunk before newline is buffered silently rather than leaking partial lines prematurely
|
|
1347
|
+
t.children[0].stderr.write("Open the following link to authenticate: https://accounts.google.com/o/oauth2/v2/auth?");
|
|
1348
|
+
await flush();
|
|
1349
|
+
expect(write).not.toHaveBeenCalled();
|
|
1350
|
+
// Completing the line flushes buffered stderr, forwards to AgentRQ, and starts OAuth relay
|
|
1351
|
+
t.children[0].stderr.write("redirect_uri=http%3A%2F%2F127.0.0.1%3A43123%2Fcb\n");
|
|
1352
|
+
await flush();
|
|
1353
|
+
expect(write).toHaveBeenCalledWith("Open the following link to authenticate: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43123%2Fcb\n");
|
|
1354
|
+
expect(printed()).toContain("[auth] The agent started browser sign-in during session setup; waiting for sign-in...");
|
|
1355
|
+
expect(askUntil).toHaveBeenCalledTimes(1);
|
|
1356
|
+
expect(capturedSignal?.aborted).toBe(false);
|
|
1357
|
+
expect(t.ws().controls()).toEqual([
|
|
1358
|
+
{
|
|
1359
|
+
agentrqBridge: "stderr",
|
|
1360
|
+
lines: [
|
|
1361
|
+
"Open the following link to authenticate: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43123%2Fcb",
|
|
1362
|
+
],
|
|
1363
|
+
},
|
|
1364
|
+
{
|
|
1365
|
+
agentrqBridge: "stderr",
|
|
1366
|
+
lines: ["[auth] The agent started browser sign-in during session setup; waiting for sign-in..."],
|
|
1367
|
+
},
|
|
1368
|
+
]);
|
|
1369
|
+
// Subsequent stderr streams straight through while session/new is still waiting
|
|
1370
|
+
write.mockClear();
|
|
1371
|
+
t.children[0].stderr.write("waiting for browser...\n");
|
|
1372
|
+
await flush();
|
|
1373
|
+
expect(write).toHaveBeenCalledWith("waiting for browser...\n");
|
|
1374
|
+
// Completing session/new aborts the relay prompt and stops stderr forwarding
|
|
1375
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-1", result: { sessionId: "s-1" } }) + "\n");
|
|
1376
|
+
await flush();
|
|
1377
|
+
expect(capturedSignal?.aborted).toBe(true);
|
|
1378
|
+
write.mockClear();
|
|
1379
|
+
t.children[0].stderr.write("quiet after session/new\n");
|
|
1380
|
+
await flush();
|
|
1381
|
+
expect(write).not.toHaveBeenCalled();
|
|
1382
|
+
write.mockRestore();
|
|
1383
|
+
});
|
|
1384
|
+
it("warns when session/new triggers headless browser OAuth and reports stall timer", async () => {
|
|
1385
|
+
const write = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
|
|
1386
|
+
const t = await connected();
|
|
1387
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-h", method: "session/new", params: { mcpServers: [] } }));
|
|
1388
|
+
t.children[0].stderr.write("Open: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43124%2F\n");
|
|
1389
|
+
await flush();
|
|
1390
|
+
expect(printed()).toContain("[auth] The agent started browser sign-in during session setup, but no interactive terminal is attached; run `acp-gateway --login` to re-authenticate.");
|
|
1391
|
+
// Extra chunk does not duplicate the warning; advancing 15s reports waiting for browser sign-in
|
|
1392
|
+
t.children[0].stderr.write("still waiting...\n");
|
|
1393
|
+
vi.advanceTimersByTime(15_000);
|
|
1394
|
+
await flush();
|
|
1395
|
+
expect(printed()).toContain("[acp-gateway] session/new is still waiting on the agent after 15 s (waiting for browser sign-in).");
|
|
1396
|
+
expect(t.ws().controls()).toContainEqual({
|
|
1397
|
+
agentrqBridge: "stderr",
|
|
1398
|
+
lines: ["[acp-gateway] session/new is still waiting on the agent after 15 s (waiting for browser sign-in)."],
|
|
1399
|
+
});
|
|
1400
|
+
write.mockRestore();
|
|
1401
|
+
});
|
|
1402
|
+
it("warns on silent session/new stalls, logs completion, and handles verbose OAuth detection", async () => {
|
|
1403
|
+
const write = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
|
|
1404
|
+
const t = await connected();
|
|
1405
|
+
// Silent stall: no stderr output for 15s
|
|
1406
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-silent", method: "session/new", params: { mcpServers: [] } }));
|
|
1407
|
+
vi.advanceTimersByTime(15_000);
|
|
1408
|
+
await flush();
|
|
1409
|
+
expect(printed()).toContain("[acp-gateway] session/new is still waiting on the agent after 15 s (no output on stderr; if the agent is stuck on login, run `acp-gateway --login` or pass --verbose).");
|
|
1410
|
+
vi.advanceTimersByTime(5_000);
|
|
1411
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-silent", result: { sessionId: "s-2" } }) + "\n");
|
|
1412
|
+
await flush();
|
|
1413
|
+
expect(printed()).toContain("[acp-gateway] session/new completed after 20 s.");
|
|
1414
|
+
// Stall after non-OAuth stderr (partial line without trailing newline)
|
|
1415
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-log", method: "session/load", params: { sessionId: "s-2", mcpServers: [] } }));
|
|
1416
|
+
t.children[0].stderr.write("loading history...\r\n");
|
|
1417
|
+
t.children[0].stderr.write("still loading");
|
|
1418
|
+
vi.advanceTimersByTime(15_000);
|
|
1419
|
+
await flush();
|
|
1420
|
+
expect(write).toHaveBeenCalledWith("loading history...\r\nstill loading");
|
|
1421
|
+
expect(write).toHaveBeenCalledWith("\n");
|
|
1422
|
+
expect(printed()).toContain("[acp-gateway] session/load is still waiting on the agent after 15 s.");
|
|
1423
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-log", result: {} }) + "\n");
|
|
1424
|
+
await flush();
|
|
1425
|
+
// Under --verbose, OAuth detection does not double-flush already streamed stderr
|
|
1426
|
+
setVerbose(true);
|
|
1427
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-v", method: "session/new", params: { mcpServers: [] } }));
|
|
1428
|
+
t.children[0].stderr.write("Open: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43125%2F\n");
|
|
1429
|
+
await flush();
|
|
1430
|
+
expect(printed()).toContain("no interactive terminal is attached");
|
|
1431
|
+
write.mockRestore();
|
|
1432
|
+
});
|
|
1433
|
+
it("flushes stderr when session/new fails or is cancelled across epochs and stays quiet on fast opens", async () => {
|
|
1434
|
+
const write = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
|
|
1435
|
+
const t = await connected();
|
|
1436
|
+
// Fast clean session/new writes debug stderr silently and clears its buffer
|
|
1437
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-ok", method: "session/new", params: { mcpServers: [] } }));
|
|
1438
|
+
t.children[0].stderr.write("harmless init\n");
|
|
1439
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-ok", result: { sessionId: "s-ok" } }) + "\n");
|
|
1440
|
+
await flush();
|
|
1441
|
+
expect(write).not.toHaveBeenCalled();
|
|
1442
|
+
// Failed session/new flushes its buffered stderr and reports error message/code/unknown
|
|
1443
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-err1", method: "session/new", params: { mcpServers: [] } }));
|
|
1444
|
+
t.children[0].stderr.write("token expired\n");
|
|
1445
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-err1", error: { code: -32000, message: "auth failed" } }) + "\n");
|
|
1446
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-err2", method: "session/new", params: { mcpServers: [] } }));
|
|
1447
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-err2", error: { code: -32603 } }) + "\n");
|
|
1448
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-err3", method: "session/new", params: { mcpServers: [] } }));
|
|
1449
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "snew-err3", error: {} }) + "\n");
|
|
1450
|
+
await flush();
|
|
1451
|
+
expect(write).toHaveBeenCalledWith("token expired\n");
|
|
1452
|
+
expect(printed()).toContain("[acp-gateway] session/new failed: auth failed");
|
|
1453
|
+
expect(printed()).toContain("[acp-gateway] session/new failed: -32603");
|
|
1454
|
+
expect(printed()).toContain("[acp-gateway] session/new failed: unknown");
|
|
1455
|
+
// Overlapping authenticate + session/new keeps watch alive until both finish
|
|
1456
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "auth-ov", method: "authenticate", params: { methodId: "oauth" } }));
|
|
1457
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: "snew-ov", method: "session/new", params: { mcpServers: [] } }));
|
|
1458
|
+
t.children[0].stderr.write("Open: https://accounts.google.com/o/oauth2/v2/auth?redirect_uri=http%3A%2F%2F127.0.0.1%3A43126%2F\n");
|
|
1459
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "auth-ov", result: {} }) + "\n");
|
|
1460
|
+
await flush();
|
|
1461
|
+
expect(printed()).not.toContain("during session setup");
|
|
1462
|
+
// Cancelling an epoch=0 session/new flushes stderr and suppresses later stall warning
|
|
1463
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", method: "$/cancel_request", params: { requestId: "snew-ov" } }));
|
|
1464
|
+
await flush();
|
|
1465
|
+
expect(printed()).toContain("[acp-gateway] session/new was cancelled while waiting on the agent.");
|
|
1466
|
+
// Unrelated response/cancel does not fail, and epoch > 0 cancel rewrites & clears watch
|
|
1467
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", method: "$/cancel_request", params: { requestId: "unknown" } }));
|
|
1468
|
+
t.ws().drop(4001);
|
|
1469
|
+
vi.advanceTimersByTime(1000);
|
|
1470
|
+
t.ws().open();
|
|
1471
|
+
t.ws().welcome();
|
|
1472
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: 7, method: "session/new", params: { mcpServers: [] } }));
|
|
1473
|
+
// Second concurrent session/new tests tidySessionOpenWatch while another remains open
|
|
1474
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", id: 8, method: "session/new", params: { mcpServers: [] } }));
|
|
1475
|
+
t.children[0].stderr.write("\r\n");
|
|
1476
|
+
t.children[0].stdout.write(JSON.stringify({ jsonrpc: "2.0", id: "1:8", result: { sessionId: "s-8" } }) + "\n");
|
|
1477
|
+
t.ws().receive(JSON.stringify({ jsonrpc: "2.0", method: "$/cancel_request", params: { requestId: 7 } }));
|
|
1478
|
+
vi.advanceTimersByTime(15_000);
|
|
1479
|
+
await flush();
|
|
1480
|
+
expect(printed()).not.toContain("still waiting on the agent");
|
|
1481
|
+
write.mockRestore();
|
|
1482
|
+
});
|
|
1032
1483
|
});
|
|
1033
1484
|
//# sourceMappingURL=native.test.js.map
|