@react-grab/cursor 0.1.0-beta.8 → 0.1.0
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/dist/cli.cjs +35 -10
- package/dist/cli.js +35 -10
- package/dist/client.cjs +14 -7
- package/dist/client.global.js +449 -2
- package/dist/client.js +14 -7
- package/dist/handler.cjs +1 -1
- package/dist/handler.js +1 -1
- package/package.json +12 -12
package/dist/cli.cjs
CHANGED
|
@@ -5461,8 +5461,13 @@ ${context.content.join("\n\n")}`;
|
|
|
5461
5461
|
signal
|
|
5462
5462
|
})) {
|
|
5463
5463
|
if (signal.aborted) break;
|
|
5464
|
+
const getBrowserMessageType = (messageType) => {
|
|
5465
|
+
if (messageType === "status") return "agent-status";
|
|
5466
|
+
if (messageType === "error") return "agent-error";
|
|
5467
|
+
return "agent-done";
|
|
5468
|
+
};
|
|
5464
5469
|
sendToBrowser(browserSocket, {
|
|
5465
|
-
type: message.type
|
|
5470
|
+
type: getBrowserMessageType(message.type),
|
|
5466
5471
|
agentId: handler.agentId,
|
|
5467
5472
|
sessionId,
|
|
5468
5473
|
content: message.content
|
|
@@ -5665,9 +5670,13 @@ ${context.content.join("\n\n")}`;
|
|
|
5665
5670
|
} else if (message.type === "agent-status" || message.type === "agent-done" || message.type === "agent-error") {
|
|
5666
5671
|
const messageQueue = sessionMessageQueues.get(message.sessionId);
|
|
5667
5672
|
if (messageQueue) {
|
|
5668
|
-
const
|
|
5673
|
+
const getQueueMessageType = (handlerMessageType) => {
|
|
5674
|
+
if (handlerMessageType === "agent-status") return "status";
|
|
5675
|
+
if (handlerMessageType === "agent-done") return "done";
|
|
5676
|
+
return "error";
|
|
5677
|
+
};
|
|
5669
5678
|
messageQueue.push({
|
|
5670
|
-
type:
|
|
5679
|
+
type: getQueueMessageType(message.type),
|
|
5671
5680
|
content: message.content ?? ""
|
|
5672
5681
|
});
|
|
5673
5682
|
if (message.type === "agent-done" || message.type === "agent-error") {
|
|
@@ -5690,7 +5699,12 @@ ${context.content.join("\n\n")}`;
|
|
|
5690
5699
|
}
|
|
5691
5700
|
}
|
|
5692
5701
|
res.writeHead(200, { "Content-Type": "application/json" });
|
|
5693
|
-
res.end(
|
|
5702
|
+
res.end(
|
|
5703
|
+
JSON.stringify({
|
|
5704
|
+
status: "ok",
|
|
5705
|
+
handlers: getRegisteredHandlerIds()
|
|
5706
|
+
})
|
|
5707
|
+
);
|
|
5694
5708
|
return;
|
|
5695
5709
|
}
|
|
5696
5710
|
res.writeHead(404);
|
|
@@ -5705,7 +5719,10 @@ ${context.content.join("\n\n")}`;
|
|
|
5705
5719
|
});
|
|
5706
5720
|
webSocketServer.on("connection", (socket, request) => {
|
|
5707
5721
|
if (token) {
|
|
5708
|
-
const connectionUrl = new URL(
|
|
5722
|
+
const connectionUrl = new URL(
|
|
5723
|
+
request.url ?? "",
|
|
5724
|
+
`http://localhost:${port}`
|
|
5725
|
+
);
|
|
5709
5726
|
const clientToken = connectionUrl.searchParams.get(RELAY_TOKEN_PARAM);
|
|
5710
5727
|
if (clientToken !== token) {
|
|
5711
5728
|
socket.close(4001, "Unauthorized");
|
|
@@ -5746,7 +5763,9 @@ ${context.content.join("\n\n")}`;
|
|
|
5746
5763
|
});
|
|
5747
5764
|
socket.on("message", (data) => {
|
|
5748
5765
|
try {
|
|
5749
|
-
const message = JSON.parse(
|
|
5766
|
+
const message = JSON.parse(
|
|
5767
|
+
data.toString()
|
|
5768
|
+
);
|
|
5750
5769
|
handleBrowserMessage(socket, message);
|
|
5751
5770
|
} catch {
|
|
5752
5771
|
}
|
|
@@ -5791,7 +5810,10 @@ ${context.content.join("\n\n")}`;
|
|
|
5791
5810
|
httpServer?.close();
|
|
5792
5811
|
};
|
|
5793
5812
|
const registerHandler = (handler) => {
|
|
5794
|
-
registeredHandlers.set(handler.agentId, {
|
|
5813
|
+
registeredHandlers.set(handler.agentId, {
|
|
5814
|
+
agentId: handler.agentId,
|
|
5815
|
+
handler
|
|
5816
|
+
});
|
|
5795
5817
|
broadcastHandlerList();
|
|
5796
5818
|
};
|
|
5797
5819
|
const unregisterHandler = (agentId) => {
|
|
@@ -8352,7 +8374,7 @@ async function fkill(inputs, options = {}) {
|
|
|
8352
8374
|
}
|
|
8353
8375
|
}
|
|
8354
8376
|
var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
8355
|
-
var VERSION = "0.1.0
|
|
8377
|
+
var VERSION = "0.1.0";
|
|
8356
8378
|
var checkIfRelayServerIsRunning = async (port, token) => {
|
|
8357
8379
|
try {
|
|
8358
8380
|
const healthUrl = token ? `http://localhost:${port}/health?${RELAY_TOKEN_PARAM}=${encodeURIComponent(token)}` : `http://localhost:${port}/health`;
|
|
@@ -8370,7 +8392,10 @@ var connectRelay = async (options) => {
|
|
|
8370
8392
|
const { handler, token } = options;
|
|
8371
8393
|
let relayServer = null;
|
|
8372
8394
|
let isRelayHost = false;
|
|
8373
|
-
const isRelayServerRunning = await checkIfRelayServerIsRunning(
|
|
8395
|
+
const isRelayServerRunning = await checkIfRelayServerIsRunning(
|
|
8396
|
+
relayPort,
|
|
8397
|
+
token
|
|
8398
|
+
);
|
|
8374
8399
|
if (isRelayServerRunning) {
|
|
8375
8400
|
relayServer = await connectToExistingRelay(relayPort, handler, token);
|
|
8376
8401
|
} else {
|
|
@@ -15204,7 +15229,7 @@ var runCursorAgent = async function* (prompt, options) {
|
|
|
15204
15229
|
if (signal.aborted) {
|
|
15205
15230
|
handleAbort2();
|
|
15206
15231
|
} else {
|
|
15207
|
-
signal.addEventListener("abort", handleAbort2);
|
|
15232
|
+
signal.addEventListener("abort", handleAbort2, { once: true });
|
|
15208
15233
|
}
|
|
15209
15234
|
}
|
|
15210
15235
|
cleanupSignalListener = () => {
|
package/dist/cli.js
CHANGED
|
@@ -5450,8 +5450,13 @@ ${context.content.join("\n\n")}`;
|
|
|
5450
5450
|
signal
|
|
5451
5451
|
})) {
|
|
5452
5452
|
if (signal.aborted) break;
|
|
5453
|
+
const getBrowserMessageType = (messageType) => {
|
|
5454
|
+
if (messageType === "status") return "agent-status";
|
|
5455
|
+
if (messageType === "error") return "agent-error";
|
|
5456
|
+
return "agent-done";
|
|
5457
|
+
};
|
|
5453
5458
|
sendToBrowser(browserSocket, {
|
|
5454
|
-
type: message.type
|
|
5459
|
+
type: getBrowserMessageType(message.type),
|
|
5455
5460
|
agentId: handler.agentId,
|
|
5456
5461
|
sessionId,
|
|
5457
5462
|
content: message.content
|
|
@@ -5654,9 +5659,13 @@ ${context.content.join("\n\n")}`;
|
|
|
5654
5659
|
} else if (message.type === "agent-status" || message.type === "agent-done" || message.type === "agent-error") {
|
|
5655
5660
|
const messageQueue = sessionMessageQueues.get(message.sessionId);
|
|
5656
5661
|
if (messageQueue) {
|
|
5657
|
-
const
|
|
5662
|
+
const getQueueMessageType = (handlerMessageType) => {
|
|
5663
|
+
if (handlerMessageType === "agent-status") return "status";
|
|
5664
|
+
if (handlerMessageType === "agent-done") return "done";
|
|
5665
|
+
return "error";
|
|
5666
|
+
};
|
|
5658
5667
|
messageQueue.push({
|
|
5659
|
-
type:
|
|
5668
|
+
type: getQueueMessageType(message.type),
|
|
5660
5669
|
content: message.content ?? ""
|
|
5661
5670
|
});
|
|
5662
5671
|
if (message.type === "agent-done" || message.type === "agent-error") {
|
|
@@ -5679,7 +5688,12 @@ ${context.content.join("\n\n")}`;
|
|
|
5679
5688
|
}
|
|
5680
5689
|
}
|
|
5681
5690
|
res.writeHead(200, { "Content-Type": "application/json" });
|
|
5682
|
-
res.end(
|
|
5691
|
+
res.end(
|
|
5692
|
+
JSON.stringify({
|
|
5693
|
+
status: "ok",
|
|
5694
|
+
handlers: getRegisteredHandlerIds()
|
|
5695
|
+
})
|
|
5696
|
+
);
|
|
5683
5697
|
return;
|
|
5684
5698
|
}
|
|
5685
5699
|
res.writeHead(404);
|
|
@@ -5694,7 +5708,10 @@ ${context.content.join("\n\n")}`;
|
|
|
5694
5708
|
});
|
|
5695
5709
|
webSocketServer.on("connection", (socket, request) => {
|
|
5696
5710
|
if (token) {
|
|
5697
|
-
const connectionUrl = new URL(
|
|
5711
|
+
const connectionUrl = new URL(
|
|
5712
|
+
request.url ?? "",
|
|
5713
|
+
`http://localhost:${port}`
|
|
5714
|
+
);
|
|
5698
5715
|
const clientToken = connectionUrl.searchParams.get(RELAY_TOKEN_PARAM);
|
|
5699
5716
|
if (clientToken !== token) {
|
|
5700
5717
|
socket.close(4001, "Unauthorized");
|
|
@@ -5735,7 +5752,9 @@ ${context.content.join("\n\n")}`;
|
|
|
5735
5752
|
});
|
|
5736
5753
|
socket.on("message", (data) => {
|
|
5737
5754
|
try {
|
|
5738
|
-
const message = JSON.parse(
|
|
5755
|
+
const message = JSON.parse(
|
|
5756
|
+
data.toString()
|
|
5757
|
+
);
|
|
5739
5758
|
handleBrowserMessage(socket, message);
|
|
5740
5759
|
} catch {
|
|
5741
5760
|
}
|
|
@@ -5780,7 +5799,10 @@ ${context.content.join("\n\n")}`;
|
|
|
5780
5799
|
httpServer?.close();
|
|
5781
5800
|
};
|
|
5782
5801
|
const registerHandler = (handler) => {
|
|
5783
|
-
registeredHandlers.set(handler.agentId, {
|
|
5802
|
+
registeredHandlers.set(handler.agentId, {
|
|
5803
|
+
agentId: handler.agentId,
|
|
5804
|
+
handler
|
|
5805
|
+
});
|
|
5784
5806
|
broadcastHandlerList();
|
|
5785
5807
|
};
|
|
5786
5808
|
const unregisterHandler = (agentId) => {
|
|
@@ -8341,7 +8363,7 @@ async function fkill(inputs, options = {}) {
|
|
|
8341
8363
|
}
|
|
8342
8364
|
}
|
|
8343
8365
|
var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
8344
|
-
var VERSION = "0.1.0
|
|
8366
|
+
var VERSION = "0.1.0";
|
|
8345
8367
|
var checkIfRelayServerIsRunning = async (port, token) => {
|
|
8346
8368
|
try {
|
|
8347
8369
|
const healthUrl = token ? `http://localhost:${port}/health?${RELAY_TOKEN_PARAM}=${encodeURIComponent(token)}` : `http://localhost:${port}/health`;
|
|
@@ -8359,7 +8381,10 @@ var connectRelay = async (options) => {
|
|
|
8359
8381
|
const { handler, token } = options;
|
|
8360
8382
|
let relayServer = null;
|
|
8361
8383
|
let isRelayHost = false;
|
|
8362
|
-
const isRelayServerRunning = await checkIfRelayServerIsRunning(
|
|
8384
|
+
const isRelayServerRunning = await checkIfRelayServerIsRunning(
|
|
8385
|
+
relayPort,
|
|
8386
|
+
token
|
|
8387
|
+
);
|
|
8363
8388
|
if (isRelayServerRunning) {
|
|
8364
8389
|
relayServer = await connectToExistingRelay(relayPort, handler, token);
|
|
8365
8390
|
} else {
|
|
@@ -15193,7 +15218,7 @@ var runCursorAgent = async function* (prompt, options) {
|
|
|
15193
15218
|
if (signal.aborted) {
|
|
15194
15219
|
handleAbort2();
|
|
15195
15220
|
} else {
|
|
15196
|
-
signal.addEventListener("abort", handleAbort2);
|
|
15221
|
+
signal.addEventListener("abort", handleAbort2, { once: true });
|
|
15197
15222
|
}
|
|
15198
15223
|
}
|
|
15199
15224
|
cleanupSignalListener = () => {
|
package/dist/client.cjs
CHANGED
|
@@ -210,7 +210,7 @@ var createRelayAgentProvider = (options) => {
|
|
|
210
210
|
rejectNextMessage = null;
|
|
211
211
|
}
|
|
212
212
|
};
|
|
213
|
-
signal.addEventListener("abort", handleAbort);
|
|
213
|
+
signal.addEventListener("abort", handleAbort, { once: true });
|
|
214
214
|
const handleConnectionChange = (connected) => {
|
|
215
215
|
if (!connected && !isDone) {
|
|
216
216
|
errorMessage = "Relay connection lost";
|
|
@@ -260,7 +260,10 @@ var createRelayAgentProvider = (options) => {
|
|
|
260
260
|
signal.removeEventListener("abort", handleAbort);
|
|
261
261
|
throw new Error("Relay connection is not open");
|
|
262
262
|
}
|
|
263
|
-
const didSendRequest = relayClient.sendAgentRequest(
|
|
263
|
+
const didSendRequest = relayClient.sendAgentRequest(
|
|
264
|
+
agentId,
|
|
265
|
+
contextWithSession
|
|
266
|
+
);
|
|
264
267
|
if (!didSendRequest) {
|
|
265
268
|
unsubscribeConnection();
|
|
266
269
|
unsubscribeMessage();
|
|
@@ -318,12 +321,16 @@ var createRelayAgentProvider = (options) => {
|
|
|
318
321
|
reject(new Error(message.content ?? "Operation failed"));
|
|
319
322
|
}
|
|
320
323
|
});
|
|
321
|
-
const unsubscribeConnection = relayClient.onConnectionChange(
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
324
|
+
const unsubscribeConnection = relayClient.onConnectionChange(
|
|
325
|
+
(connected) => {
|
|
326
|
+
if (!connected) {
|
|
327
|
+
cleanup();
|
|
328
|
+
reject(
|
|
329
|
+
new Error("Connection lost while waiting for operation response")
|
|
330
|
+
);
|
|
331
|
+
}
|
|
325
332
|
}
|
|
326
|
-
|
|
333
|
+
);
|
|
327
334
|
});
|
|
328
335
|
};
|
|
329
336
|
const undo = async () => {
|
package/dist/client.global.js
CHANGED
|
@@ -1,2 +1,449 @@
|
|
|
1
|
-
var ReactGrabCursor
|
|
2
|
-
|
|
1
|
+
var ReactGrabCursor = (function (exports) {
|
|
2
|
+
'use strict';
|
|
3
|
+
|
|
4
|
+
// ../relay/dist/client.js
|
|
5
|
+
var DEFAULT_RELAY_PORT = 4722;
|
|
6
|
+
var DEFAULT_RECONNECT_INTERVAL_MS = 3e3;
|
|
7
|
+
var RELAY_TOKEN_PARAM = "token";
|
|
8
|
+
var createRelayClient = (options = {}) => {
|
|
9
|
+
const serverUrl = options.serverUrl ?? `ws://localhost:${DEFAULT_RELAY_PORT}`;
|
|
10
|
+
const autoReconnect = options.autoReconnect ?? true;
|
|
11
|
+
const reconnectIntervalMs = options.reconnectIntervalMs ?? DEFAULT_RECONNECT_INTERVAL_MS;
|
|
12
|
+
const token = options.token;
|
|
13
|
+
let webSocketConnection = null;
|
|
14
|
+
let isConnectedState = false;
|
|
15
|
+
let availableHandlers = [];
|
|
16
|
+
let reconnectTimeoutId = null;
|
|
17
|
+
let pendingConnectionPromise = null;
|
|
18
|
+
let pendingConnectionReject = null;
|
|
19
|
+
let isIntentionalDisconnect = false;
|
|
20
|
+
const messageCallbacks = /* @__PURE__ */ new Set();
|
|
21
|
+
const handlersChangeCallbacks = /* @__PURE__ */ new Set();
|
|
22
|
+
const connectionChangeCallbacks = /* @__PURE__ */ new Set();
|
|
23
|
+
const scheduleReconnect = () => {
|
|
24
|
+
if (!autoReconnect || reconnectTimeoutId || isIntentionalDisconnect) return;
|
|
25
|
+
reconnectTimeoutId = setTimeout(() => {
|
|
26
|
+
reconnectTimeoutId = null;
|
|
27
|
+
connect().catch(() => {
|
|
28
|
+
});
|
|
29
|
+
}, reconnectIntervalMs);
|
|
30
|
+
};
|
|
31
|
+
const handleMessage = (event) => {
|
|
32
|
+
try {
|
|
33
|
+
const message = JSON.parse(event.data);
|
|
34
|
+
if (message.type === "handlers" && message.handlers) {
|
|
35
|
+
availableHandlers = message.handlers;
|
|
36
|
+
for (const callback of handlersChangeCallbacks) {
|
|
37
|
+
callback(availableHandlers);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
for (const callback of messageCallbacks) {
|
|
41
|
+
callback(message);
|
|
42
|
+
}
|
|
43
|
+
} catch {
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
const connect = () => {
|
|
47
|
+
if (webSocketConnection?.readyState === WebSocket.OPEN) {
|
|
48
|
+
return Promise.resolve();
|
|
49
|
+
}
|
|
50
|
+
if (pendingConnectionPromise) {
|
|
51
|
+
return pendingConnectionPromise;
|
|
52
|
+
}
|
|
53
|
+
isIntentionalDisconnect = false;
|
|
54
|
+
pendingConnectionPromise = new Promise((resolve, reject) => {
|
|
55
|
+
pendingConnectionReject = reject;
|
|
56
|
+
const connectionUrl = token ? `${serverUrl}?${RELAY_TOKEN_PARAM}=${encodeURIComponent(token)}` : serverUrl;
|
|
57
|
+
webSocketConnection = new WebSocket(connectionUrl);
|
|
58
|
+
webSocketConnection.onopen = () => {
|
|
59
|
+
pendingConnectionPromise = null;
|
|
60
|
+
pendingConnectionReject = null;
|
|
61
|
+
isConnectedState = true;
|
|
62
|
+
for (const callback of connectionChangeCallbacks) {
|
|
63
|
+
callback(true);
|
|
64
|
+
}
|
|
65
|
+
resolve();
|
|
66
|
+
};
|
|
67
|
+
webSocketConnection.onmessage = handleMessage;
|
|
68
|
+
webSocketConnection.onclose = () => {
|
|
69
|
+
if (pendingConnectionReject) {
|
|
70
|
+
pendingConnectionReject(new Error("WebSocket connection closed"));
|
|
71
|
+
pendingConnectionReject = null;
|
|
72
|
+
}
|
|
73
|
+
pendingConnectionPromise = null;
|
|
74
|
+
isConnectedState = false;
|
|
75
|
+
availableHandlers = [];
|
|
76
|
+
for (const callback of handlersChangeCallbacks) {
|
|
77
|
+
callback(availableHandlers);
|
|
78
|
+
}
|
|
79
|
+
for (const callback of connectionChangeCallbacks) {
|
|
80
|
+
callback(false);
|
|
81
|
+
}
|
|
82
|
+
scheduleReconnect();
|
|
83
|
+
};
|
|
84
|
+
webSocketConnection.onerror = () => {
|
|
85
|
+
pendingConnectionPromise = null;
|
|
86
|
+
pendingConnectionReject = null;
|
|
87
|
+
isConnectedState = false;
|
|
88
|
+
reject(new Error("WebSocket connection failed"));
|
|
89
|
+
};
|
|
90
|
+
});
|
|
91
|
+
return pendingConnectionPromise;
|
|
92
|
+
};
|
|
93
|
+
const disconnect = () => {
|
|
94
|
+
isIntentionalDisconnect = true;
|
|
95
|
+
if (reconnectTimeoutId) {
|
|
96
|
+
clearTimeout(reconnectTimeoutId);
|
|
97
|
+
reconnectTimeoutId = null;
|
|
98
|
+
}
|
|
99
|
+
if (pendingConnectionReject) {
|
|
100
|
+
pendingConnectionReject(new Error("Connection aborted"));
|
|
101
|
+
pendingConnectionReject = null;
|
|
102
|
+
}
|
|
103
|
+
pendingConnectionPromise = null;
|
|
104
|
+
webSocketConnection?.close();
|
|
105
|
+
webSocketConnection = null;
|
|
106
|
+
isConnectedState = false;
|
|
107
|
+
availableHandlers = [];
|
|
108
|
+
};
|
|
109
|
+
const isConnected = () => isConnectedState;
|
|
110
|
+
const sendMessage = (message) => {
|
|
111
|
+
if (webSocketConnection?.readyState === WebSocket.OPEN) {
|
|
112
|
+
webSocketConnection.send(JSON.stringify(message));
|
|
113
|
+
return true;
|
|
114
|
+
}
|
|
115
|
+
return false;
|
|
116
|
+
};
|
|
117
|
+
const sendAgentRequest = (agentId, context) => {
|
|
118
|
+
return sendMessage({
|
|
119
|
+
type: "agent-request",
|
|
120
|
+
agentId,
|
|
121
|
+
sessionId: context.sessionId,
|
|
122
|
+
context
|
|
123
|
+
});
|
|
124
|
+
};
|
|
125
|
+
const abortAgent = (agentId, sessionId) => {
|
|
126
|
+
sendMessage({
|
|
127
|
+
type: "agent-abort",
|
|
128
|
+
agentId,
|
|
129
|
+
sessionId
|
|
130
|
+
});
|
|
131
|
+
};
|
|
132
|
+
const undoAgent = (agentId, sessionId) => {
|
|
133
|
+
return sendMessage({
|
|
134
|
+
type: "agent-undo",
|
|
135
|
+
agentId,
|
|
136
|
+
sessionId
|
|
137
|
+
});
|
|
138
|
+
};
|
|
139
|
+
const redoAgent = (agentId, sessionId) => {
|
|
140
|
+
return sendMessage({
|
|
141
|
+
type: "agent-redo",
|
|
142
|
+
agentId,
|
|
143
|
+
sessionId
|
|
144
|
+
});
|
|
145
|
+
};
|
|
146
|
+
const onMessage = (callback) => {
|
|
147
|
+
messageCallbacks.add(callback);
|
|
148
|
+
return () => messageCallbacks.delete(callback);
|
|
149
|
+
};
|
|
150
|
+
const onHandlersChange = (callback) => {
|
|
151
|
+
handlersChangeCallbacks.add(callback);
|
|
152
|
+
return () => handlersChangeCallbacks.delete(callback);
|
|
153
|
+
};
|
|
154
|
+
const onConnectionChange = (callback) => {
|
|
155
|
+
connectionChangeCallbacks.add(callback);
|
|
156
|
+
queueMicrotask(() => {
|
|
157
|
+
if (connectionChangeCallbacks.has(callback)) {
|
|
158
|
+
callback(isConnectedState);
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
return () => connectionChangeCallbacks.delete(callback);
|
|
162
|
+
};
|
|
163
|
+
const getAvailableHandlers = () => availableHandlers;
|
|
164
|
+
return {
|
|
165
|
+
connect,
|
|
166
|
+
disconnect,
|
|
167
|
+
isConnected,
|
|
168
|
+
sendAgentRequest,
|
|
169
|
+
abortAgent,
|
|
170
|
+
undoAgent,
|
|
171
|
+
redoAgent,
|
|
172
|
+
onMessage,
|
|
173
|
+
onHandlersChange,
|
|
174
|
+
onConnectionChange,
|
|
175
|
+
getAvailableHandlers
|
|
176
|
+
};
|
|
177
|
+
};
|
|
178
|
+
var createRelayAgentProvider = (options) => {
|
|
179
|
+
const { relayClient, agentId } = options;
|
|
180
|
+
const checkConnection = async () => {
|
|
181
|
+
if (!relayClient.isConnected()) {
|
|
182
|
+
try {
|
|
183
|
+
await relayClient.connect();
|
|
184
|
+
} catch {
|
|
185
|
+
return false;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
return relayClient.getAvailableHandlers().includes(agentId);
|
|
189
|
+
};
|
|
190
|
+
const send = async function* (context, signal) {
|
|
191
|
+
if (signal.aborted) {
|
|
192
|
+
throw new DOMException("Aborted", "AbortError");
|
|
193
|
+
}
|
|
194
|
+
yield "Connecting\u2026";
|
|
195
|
+
const sessionId = context.sessionId ?? `session-${Date.now()}-${Math.random().toString(36).slice(2)}`;
|
|
196
|
+
const contextWithSession = {
|
|
197
|
+
...context,
|
|
198
|
+
sessionId
|
|
199
|
+
};
|
|
200
|
+
const messageQueue = [];
|
|
201
|
+
let resolveNextMessage = null;
|
|
202
|
+
let rejectNextMessage = null;
|
|
203
|
+
let isDone = false;
|
|
204
|
+
let errorMessage = null;
|
|
205
|
+
const handleAbort = () => {
|
|
206
|
+
relayClient.abortAgent(agentId, sessionId);
|
|
207
|
+
isDone = true;
|
|
208
|
+
if (resolveNextMessage) {
|
|
209
|
+
resolveNextMessage({ value: void 0, done: true });
|
|
210
|
+
resolveNextMessage = null;
|
|
211
|
+
rejectNextMessage = null;
|
|
212
|
+
}
|
|
213
|
+
};
|
|
214
|
+
signal.addEventListener("abort", handleAbort, { once: true });
|
|
215
|
+
const handleConnectionChange = (connected) => {
|
|
216
|
+
if (!connected && !isDone) {
|
|
217
|
+
errorMessage = "Relay connection lost";
|
|
218
|
+
isDone = true;
|
|
219
|
+
if (rejectNextMessage) {
|
|
220
|
+
rejectNextMessage(new Error(errorMessage));
|
|
221
|
+
resolveNextMessage = null;
|
|
222
|
+
rejectNextMessage = null;
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
};
|
|
226
|
+
const unsubscribeConnection = relayClient.onConnectionChange(
|
|
227
|
+
handleConnectionChange
|
|
228
|
+
);
|
|
229
|
+
const unsubscribeMessage = relayClient.onMessage((message) => {
|
|
230
|
+
if (message.sessionId !== sessionId) return;
|
|
231
|
+
if (message.type === "agent-status" && message.content) {
|
|
232
|
+
messageQueue.push(message.content);
|
|
233
|
+
if (resolveNextMessage) {
|
|
234
|
+
const nextMessage = messageQueue.shift();
|
|
235
|
+
if (nextMessage !== void 0) {
|
|
236
|
+
resolveNextMessage({ value: nextMessage, done: false });
|
|
237
|
+
resolveNextMessage = null;
|
|
238
|
+
rejectNextMessage = null;
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
} else if (message.type === "agent-done") {
|
|
242
|
+
isDone = true;
|
|
243
|
+
if (resolveNextMessage) {
|
|
244
|
+
resolveNextMessage({ value: void 0, done: true });
|
|
245
|
+
resolveNextMessage = null;
|
|
246
|
+
rejectNextMessage = null;
|
|
247
|
+
}
|
|
248
|
+
} else if (message.type === "agent-error") {
|
|
249
|
+
errorMessage = message.content ?? "Unknown error";
|
|
250
|
+
isDone = true;
|
|
251
|
+
if (rejectNextMessage) {
|
|
252
|
+
rejectNextMessage(new Error(errorMessage));
|
|
253
|
+
resolveNextMessage = null;
|
|
254
|
+
rejectNextMessage = null;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
});
|
|
258
|
+
if (!relayClient.isConnected()) {
|
|
259
|
+
unsubscribeConnection();
|
|
260
|
+
unsubscribeMessage();
|
|
261
|
+
signal.removeEventListener("abort", handleAbort);
|
|
262
|
+
throw new Error("Relay connection is not open");
|
|
263
|
+
}
|
|
264
|
+
const didSendRequest = relayClient.sendAgentRequest(
|
|
265
|
+
agentId,
|
|
266
|
+
contextWithSession
|
|
267
|
+
);
|
|
268
|
+
if (!didSendRequest) {
|
|
269
|
+
unsubscribeConnection();
|
|
270
|
+
unsubscribeMessage();
|
|
271
|
+
signal.removeEventListener("abort", handleAbort);
|
|
272
|
+
throw new Error("Failed to send agent request: connection not open");
|
|
273
|
+
}
|
|
274
|
+
try {
|
|
275
|
+
while (true) {
|
|
276
|
+
if (messageQueue.length > 0) {
|
|
277
|
+
const next = messageQueue.shift();
|
|
278
|
+
if (next !== void 0) {
|
|
279
|
+
yield next;
|
|
280
|
+
}
|
|
281
|
+
continue;
|
|
282
|
+
}
|
|
283
|
+
if (isDone || signal.aborted) {
|
|
284
|
+
break;
|
|
285
|
+
}
|
|
286
|
+
const result = await new Promise(
|
|
287
|
+
(resolve, reject) => {
|
|
288
|
+
resolveNextMessage = resolve;
|
|
289
|
+
rejectNextMessage = reject;
|
|
290
|
+
}
|
|
291
|
+
);
|
|
292
|
+
if (result.done) break;
|
|
293
|
+
yield result.value;
|
|
294
|
+
}
|
|
295
|
+
if (errorMessage) {
|
|
296
|
+
throw new Error(errorMessage);
|
|
297
|
+
}
|
|
298
|
+
} finally {
|
|
299
|
+
signal.removeEventListener("abort", handleAbort);
|
|
300
|
+
unsubscribeConnection();
|
|
301
|
+
unsubscribeMessage();
|
|
302
|
+
}
|
|
303
|
+
};
|
|
304
|
+
const abort = async (sessionId) => {
|
|
305
|
+
relayClient.abortAgent(agentId, sessionId);
|
|
306
|
+
};
|
|
307
|
+
const waitForOperationResponse = (sessionId) => {
|
|
308
|
+
return new Promise((resolve, reject) => {
|
|
309
|
+
let didCleanup = false;
|
|
310
|
+
const cleanup = () => {
|
|
311
|
+
if (didCleanup) return;
|
|
312
|
+
didCleanup = true;
|
|
313
|
+
unsubscribeMessage();
|
|
314
|
+
unsubscribeConnection();
|
|
315
|
+
};
|
|
316
|
+
const unsubscribeMessage = relayClient.onMessage((message) => {
|
|
317
|
+
if (message.sessionId !== sessionId) return;
|
|
318
|
+
cleanup();
|
|
319
|
+
if (message.type === "agent-done") {
|
|
320
|
+
resolve();
|
|
321
|
+
} else if (message.type === "agent-error") {
|
|
322
|
+
reject(new Error(message.content ?? "Operation failed"));
|
|
323
|
+
}
|
|
324
|
+
});
|
|
325
|
+
const unsubscribeConnection = relayClient.onConnectionChange(
|
|
326
|
+
(connected) => {
|
|
327
|
+
if (!connected) {
|
|
328
|
+
cleanup();
|
|
329
|
+
reject(
|
|
330
|
+
new Error("Connection lost while waiting for operation response")
|
|
331
|
+
);
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
);
|
|
335
|
+
});
|
|
336
|
+
};
|
|
337
|
+
const undo = async () => {
|
|
338
|
+
const sessionId = `undo-${agentId}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
|
|
339
|
+
const didSend = relayClient.undoAgent(agentId, sessionId);
|
|
340
|
+
if (!didSend) {
|
|
341
|
+
throw new Error("Failed to send undo request: connection not open");
|
|
342
|
+
}
|
|
343
|
+
return waitForOperationResponse(sessionId);
|
|
344
|
+
};
|
|
345
|
+
const redo = async () => {
|
|
346
|
+
const sessionId = `redo-${agentId}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
|
|
347
|
+
const didSend = relayClient.redoAgent(agentId, sessionId);
|
|
348
|
+
if (!didSend) {
|
|
349
|
+
throw new Error("Failed to send redo request: connection not open");
|
|
350
|
+
}
|
|
351
|
+
return waitForOperationResponse(sessionId);
|
|
352
|
+
};
|
|
353
|
+
return {
|
|
354
|
+
send,
|
|
355
|
+
abort,
|
|
356
|
+
undo,
|
|
357
|
+
redo,
|
|
358
|
+
checkConnection,
|
|
359
|
+
supportsResume: true,
|
|
360
|
+
supportsFollowUp: true
|
|
361
|
+
};
|
|
362
|
+
};
|
|
363
|
+
var defaultRelayClient = null;
|
|
364
|
+
var getDefaultRelayClient = () => {
|
|
365
|
+
if (typeof window === "undefined") {
|
|
366
|
+
return null;
|
|
367
|
+
}
|
|
368
|
+
if (window.__REACT_GRAB_RELAY__) {
|
|
369
|
+
defaultRelayClient = window.__REACT_GRAB_RELAY__;
|
|
370
|
+
return defaultRelayClient;
|
|
371
|
+
}
|
|
372
|
+
if (!defaultRelayClient) {
|
|
373
|
+
defaultRelayClient = createRelayClient();
|
|
374
|
+
window.__REACT_GRAB_RELAY__ = defaultRelayClient;
|
|
375
|
+
}
|
|
376
|
+
return defaultRelayClient;
|
|
377
|
+
};
|
|
378
|
+
|
|
379
|
+
// src/client.ts
|
|
380
|
+
var AGENT_ID = "cursor";
|
|
381
|
+
var isReactGrabApi = (value) => typeof value === "object" && value !== null && "registerPlugin" in value;
|
|
382
|
+
var createCursorAgentProvider = (providerOptions = {}) => {
|
|
383
|
+
const relayClient = providerOptions.relayClient ?? getDefaultRelayClient();
|
|
384
|
+
if (!relayClient) {
|
|
385
|
+
throw new Error("RelayClient is required in browser environments");
|
|
386
|
+
}
|
|
387
|
+
return createRelayAgentProvider({
|
|
388
|
+
relayClient,
|
|
389
|
+
agentId: AGENT_ID
|
|
390
|
+
});
|
|
391
|
+
};
|
|
392
|
+
var attachAgent = async () => {
|
|
393
|
+
if (typeof window === "undefined") return;
|
|
394
|
+
const relayClient = getDefaultRelayClient();
|
|
395
|
+
if (!relayClient) return;
|
|
396
|
+
try {
|
|
397
|
+
await relayClient.connect();
|
|
398
|
+
} catch {
|
|
399
|
+
return;
|
|
400
|
+
}
|
|
401
|
+
const provider = createRelayAgentProvider({
|
|
402
|
+
relayClient,
|
|
403
|
+
agentId: AGENT_ID
|
|
404
|
+
});
|
|
405
|
+
const attach = (api) => {
|
|
406
|
+
const agent = { provider, storage: sessionStorage };
|
|
407
|
+
const plugin = {
|
|
408
|
+
name: "cursor-agent",
|
|
409
|
+
actions: [
|
|
410
|
+
{
|
|
411
|
+
id: "edit-with-cursor",
|
|
412
|
+
label: "Edit with Cursor",
|
|
413
|
+
shortcut: "Enter",
|
|
414
|
+
onAction: (actionContext) => {
|
|
415
|
+
actionContext.enterPromptMode?.(agent);
|
|
416
|
+
},
|
|
417
|
+
agent
|
|
418
|
+
}
|
|
419
|
+
]
|
|
420
|
+
};
|
|
421
|
+
api.registerPlugin(plugin);
|
|
422
|
+
};
|
|
423
|
+
const existingApi = window.__REACT_GRAB__;
|
|
424
|
+
if (isReactGrabApi(existingApi)) {
|
|
425
|
+
attach(existingApi);
|
|
426
|
+
return;
|
|
427
|
+
}
|
|
428
|
+
window.addEventListener(
|
|
429
|
+
"react-grab:init",
|
|
430
|
+
(event) => {
|
|
431
|
+
if (!(event instanceof CustomEvent)) return;
|
|
432
|
+
if (!isReactGrabApi(event.detail)) return;
|
|
433
|
+
attach(event.detail);
|
|
434
|
+
},
|
|
435
|
+
{ once: true }
|
|
436
|
+
);
|
|
437
|
+
const apiAfterListener = window.__REACT_GRAB__;
|
|
438
|
+
if (isReactGrabApi(apiAfterListener)) {
|
|
439
|
+
attach(apiAfterListener);
|
|
440
|
+
}
|
|
441
|
+
};
|
|
442
|
+
attachAgent();
|
|
443
|
+
|
|
444
|
+
exports.attachAgent = attachAgent;
|
|
445
|
+
exports.createCursorAgentProvider = createCursorAgentProvider;
|
|
446
|
+
|
|
447
|
+
return exports;
|
|
448
|
+
|
|
449
|
+
})({});
|
package/dist/client.js
CHANGED
|
@@ -208,7 +208,7 @@ var createRelayAgentProvider = (options) => {
|
|
|
208
208
|
rejectNextMessage = null;
|
|
209
209
|
}
|
|
210
210
|
};
|
|
211
|
-
signal.addEventListener("abort", handleAbort);
|
|
211
|
+
signal.addEventListener("abort", handleAbort, { once: true });
|
|
212
212
|
const handleConnectionChange = (connected) => {
|
|
213
213
|
if (!connected && !isDone) {
|
|
214
214
|
errorMessage = "Relay connection lost";
|
|
@@ -258,7 +258,10 @@ var createRelayAgentProvider = (options) => {
|
|
|
258
258
|
signal.removeEventListener("abort", handleAbort);
|
|
259
259
|
throw new Error("Relay connection is not open");
|
|
260
260
|
}
|
|
261
|
-
const didSendRequest = relayClient.sendAgentRequest(
|
|
261
|
+
const didSendRequest = relayClient.sendAgentRequest(
|
|
262
|
+
agentId,
|
|
263
|
+
contextWithSession
|
|
264
|
+
);
|
|
262
265
|
if (!didSendRequest) {
|
|
263
266
|
unsubscribeConnection();
|
|
264
267
|
unsubscribeMessage();
|
|
@@ -316,12 +319,16 @@ var createRelayAgentProvider = (options) => {
|
|
|
316
319
|
reject(new Error(message.content ?? "Operation failed"));
|
|
317
320
|
}
|
|
318
321
|
});
|
|
319
|
-
const unsubscribeConnection = relayClient.onConnectionChange(
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
322
|
+
const unsubscribeConnection = relayClient.onConnectionChange(
|
|
323
|
+
(connected) => {
|
|
324
|
+
if (!connected) {
|
|
325
|
+
cleanup();
|
|
326
|
+
reject(
|
|
327
|
+
new Error("Connection lost while waiting for operation response")
|
|
328
|
+
);
|
|
329
|
+
}
|
|
323
330
|
}
|
|
324
|
-
|
|
331
|
+
);
|
|
325
332
|
});
|
|
326
333
|
};
|
|
327
334
|
const undo = async () => {
|
package/dist/handler.cjs
CHANGED
|
@@ -14220,7 +14220,7 @@ var runCursorAgent = async function* (prompt, options) {
|
|
|
14220
14220
|
if (signal.aborted) {
|
|
14221
14221
|
handleAbort2();
|
|
14222
14222
|
} else {
|
|
14223
|
-
signal.addEventListener("abort", handleAbort2);
|
|
14223
|
+
signal.addEventListener("abort", handleAbort2, { once: true });
|
|
14224
14224
|
}
|
|
14225
14225
|
}
|
|
14226
14226
|
cleanupSignalListener = () => {
|
package/dist/handler.js
CHANGED
|
@@ -14209,7 +14209,7 @@ var runCursorAgent = async function* (prompt, options) {
|
|
|
14209
14209
|
if (signal.aborted) {
|
|
14210
14210
|
handleAbort2();
|
|
14211
14211
|
} else {
|
|
14212
|
-
signal.addEventListener("abort", handleAbort2);
|
|
14212
|
+
signal.addEventListener("abort", handleAbort2, { once: true });
|
|
14213
14213
|
}
|
|
14214
14214
|
}
|
|
14215
14215
|
cleanupSignalListener = () => {
|
package/package.json
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-grab/cursor",
|
|
3
|
-
"version": "0.1.0
|
|
4
|
-
"type": "module",
|
|
3
|
+
"version": "0.1.0",
|
|
5
4
|
"bin": {
|
|
6
5
|
"react-grab-cursor": "./dist/cli.cjs"
|
|
7
6
|
},
|
|
7
|
+
"files": [
|
|
8
|
+
"dist"
|
|
9
|
+
],
|
|
10
|
+
"type": "module",
|
|
11
|
+
"browser": "dist/client.global.js",
|
|
8
12
|
"exports": {
|
|
9
13
|
"./client": {
|
|
10
14
|
"types": "./dist/client.d.ts",
|
|
@@ -19,19 +23,15 @@
|
|
|
19
23
|
"./dist/*": "./dist/*.js",
|
|
20
24
|
"./dist/*.js": "./dist/*.js"
|
|
21
25
|
},
|
|
22
|
-
"
|
|
23
|
-
|
|
24
|
-
"
|
|
25
|
-
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"execa": "^9.6.0",
|
|
28
|
+
"@react-grab/relay": "0.1.0",
|
|
29
|
+
"react-grab": "0.1.0"
|
|
30
|
+
},
|
|
26
31
|
"devDependencies": {
|
|
27
32
|
"@types/node": "^22.10.7",
|
|
28
33
|
"tsup": "^8.4.0",
|
|
29
|
-
"@react-grab/utils": "0.1.0
|
|
30
|
-
},
|
|
31
|
-
"dependencies": {
|
|
32
|
-
"execa": "^9.6.0",
|
|
33
|
-
"@react-grab/relay": "0.1.0-beta.8",
|
|
34
|
-
"react-grab": "0.1.0-beta.8"
|
|
34
|
+
"@react-grab/utils": "0.1.0"
|
|
35
35
|
},
|
|
36
36
|
"scripts": {
|
|
37
37
|
"dev": "tsup --watch",
|