@trusty-squire/mcp 1.1.18-rc.4 → 1.1.19-rc.1
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/bin.js +7 -12
- package/dist/bin.js.map +1 -1
- package/dist/bot/broker/authority.d.ts +6 -2
- package/dist/bot/broker/authority.d.ts.map +1 -1
- package/dist/bot/broker/authority.js +25 -5
- package/dist/bot/broker/authority.js.map +1 -1
- package/dist/bot/broker/discovery.d.ts +4 -0
- package/dist/bot/broker/discovery.d.ts.map +1 -1
- package/dist/bot/broker/discovery.js +46 -10
- package/dist/bot/broker/discovery.js.map +1 -1
- package/dist/bot/broker/forwarder.d.ts.map +1 -1
- package/dist/bot/broker/forwarder.js +9 -3
- package/dist/bot/broker/forwarder.js.map +1 -1
- package/dist/bot/broker/mcp-principal.js +2 -2
- package/dist/bot/broker/mcp-principal.js.map +1 -1
- package/dist/bot/broker/mcp-socket.js +1 -1
- package/dist/bot/broker/mcp-socket.js.map +1 -1
- package/dist/bot/broker/protocol.d.ts.map +1 -1
- package/dist/bot/broker/protocol.js +2 -1
- package/dist/bot/broker/protocol.js.map +1 -1
- package/dist/bot/broker/transport.d.ts.map +1 -1
- package/dist/bot/broker/transport.js +4 -5
- package/dist/bot/broker/transport.js.map +1 -1
- package/dist/bot/session/lifecycle.d.ts.map +1 -1
- package/dist/bot/session/lifecycle.js +3 -30
- package/dist/bot/session/lifecycle.js.map +1 -1
- package/dist/bot/session/model.d.ts.map +1 -1
- package/dist/bot/session/model.js.map +1 -1
- package/dist/relay.d.ts.map +1 -1
- package/dist/relay.js +26 -3
- package/dist/relay.js.map +1 -1
- package/dist/server.d.ts +1 -3
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +11 -239
- package/dist/server.js.map +1 -1
- package/package.json +1 -1
- package/dist/bot/broker/agent-identity.d.ts +0 -4
- package/dist/bot/broker/agent-identity.d.ts.map +0 -1
- package/dist/bot/broker/agent-identity.js +0 -12
- package/dist/bot/broker/agent-identity.js.map +0 -1
- package/dist/server-instance-registry.d.ts +0 -115
- package/dist/server-instance-registry.d.ts.map +0 -1
- package/dist/server-instance-registry.js +0 -405
- package/dist/server-instance-registry.js.map +0 -1
package/dist/bin.js
CHANGED
|
@@ -35,15 +35,7 @@ async function dispatch() {
|
|
|
35
35
|
await runBrokerDaemon();
|
|
36
36
|
return 0;
|
|
37
37
|
}
|
|
38
|
-
if (isServer) {
|
|
39
|
-
const { runServer } = await import("./server.js");
|
|
40
|
-
await runServer();
|
|
41
|
-
// runServer force-exits when its client disconnects or it receives a
|
|
42
|
-
// termination signal. A return here is therefore only a normal startup
|
|
43
|
-
// path with no active stdio loop left to keep alive.
|
|
44
|
-
return 0;
|
|
45
|
-
}
|
|
46
|
-
if (isRelay) {
|
|
38
|
+
if (isServer || isRelay) {
|
|
47
39
|
const { runRelay } = await import("./relay.js");
|
|
48
40
|
await runRelay();
|
|
49
41
|
return 0;
|
|
@@ -61,9 +53,12 @@ dispatch()
|
|
|
61
53
|
// actually reap them. Without this exit the CLI appears to hang
|
|
62
54
|
// after printing "You're done."
|
|
63
55
|
//
|
|
64
|
-
// The `server` branch
|
|
65
|
-
//
|
|
66
|
-
|
|
56
|
+
// The `server`/`relay` branch returns when the stdio pipe or a signal
|
|
57
|
+
// closes the proxy; force-exit so a detached broker child cannot keep
|
|
58
|
+
// this process alive. `skill` returns its own code via T30 taxonomy.
|
|
59
|
+
if (isServer || isRelay)
|
|
60
|
+
process.exit(code);
|
|
61
|
+
if (!isBroker)
|
|
67
62
|
process.exit(code);
|
|
68
63
|
})
|
|
69
64
|
.catch((err) => {
|
package/dist/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AACA,sDAAsD;AACtD,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,sEAAsE;AACtE,6CAA6C;AAC7C,+EAA+E;AAC/E,iEAAiE;AACjE,EAAE;AACF,uEAAuE;AACvE,qEAAqE;AACrE,wEAAwE;AACxE,kEAAkE;AAClE,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,oEAAoE;AACpE,8DAA8D;AAC9D,oCAAoC;AACpC,MAAM,aAAa,GACjB,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AAE3F,IAAI,aAAa,EAAE,CAAC;IAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AACtC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;AACpC,0EAA0E;AAC1E,4EAA4E;AAC5E,4EAA4E;AAE5E,KAAK,UAAU,QAAQ;IACrB,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QACnE,MAAM,eAAe,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,QAAQ,
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,14 +16,17 @@ export interface BrokerSessionPort {
|
|
|
16
16
|
close(reason?: "finish" | "disconnect" | "expiry"): Promise<boolean>;
|
|
17
17
|
orphan(): Promise<void>;
|
|
18
18
|
}
|
|
19
|
+
/** How long a dropped connection's sessions survive before they are closed. */
|
|
20
|
+
export declare const CONNECTION_SESSION_GRACE_MS = 5000;
|
|
19
21
|
/** This object lives only in the broker. No Page, Browser or CDP handle crosses
|
|
20
22
|
* the transport. A principal is established by connection setup, which takes
|
|
21
23
|
* no credential and names no account. A session is named by a plain session id
|
|
22
|
-
* and owned by the
|
|
24
|
+
* and owned by the connection that opened it: there are no capabilities,
|
|
23
25
|
* leases, or detached states. */
|
|
24
26
|
export declare class BrokerAuthority {
|
|
25
27
|
private readonly actors;
|
|
26
28
|
private readonly admissions;
|
|
29
|
+
private readonly pendingGraceCloses;
|
|
27
30
|
private resolve;
|
|
28
31
|
/** Start a session on the shared browser. In-flight admissions are tracked so
|
|
29
32
|
* a dropped connection aborts its own starting session instead of adopting
|
|
@@ -38,7 +41,8 @@ export declare class BrokerAuthority {
|
|
|
38
41
|
retire(principal: BrokerPrincipal, sessionId: string): void;
|
|
39
42
|
close(principal: BrokerPrincipal, sessionId: string, terminalProven?: boolean): Promise<boolean>;
|
|
40
43
|
private closeActor;
|
|
41
|
-
|
|
44
|
+
private closeOwnedSessions;
|
|
45
|
+
disconnect(principal: BrokerPrincipal, explicit?: boolean): Promise<void>;
|
|
42
46
|
/** Signal shutdown fences every session, including clients whose sockets
|
|
43
47
|
* remain connected. Expiry teardown closes tabs without waiting for a
|
|
44
48
|
* browser call that may be wedged in navigation. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authority.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAClF,MAAM,CACJ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,OAAO,CAAC,EAAE,aAAa,EACvB,MAAM,CAAC,EAAE,eAAe,GACvB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,2EAA2E;IAC3E,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;
|
|
1
|
+
{"version":3,"file":"authority.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
import { composeOperatorSignals } from "../request-cancellation.js";
|
|
2
2
|
import { randomUUID } from "node:crypto";
|
|
3
3
|
import { BrokerRefusal } from "./refusal.js";
|
|
4
|
+
/** How long a dropped connection's sessions survive before they are closed. */
|
|
5
|
+
export const CONNECTION_SESSION_GRACE_MS = 5_000;
|
|
4
6
|
/** This object lives only in the broker. No Page, Browser or CDP handle crosses
|
|
5
7
|
* the transport. A principal is established by connection setup, which takes
|
|
6
8
|
* no credential and names no account. A session is named by a plain session id
|
|
7
|
-
* and owned by the
|
|
9
|
+
* and owned by the connection that opened it: there are no capabilities,
|
|
8
10
|
* leases, or detached states. */
|
|
9
11
|
export class BrokerAuthority {
|
|
10
12
|
actors = new Map();
|
|
11
13
|
admissions = new Map();
|
|
14
|
+
pendingGraceCloses = new Set();
|
|
12
15
|
resolve(principal, sessionId) {
|
|
13
16
|
const actor = this.actors.get(sessionId);
|
|
14
|
-
if (actor === undefined || actor.principal.
|
|
17
|
+
if (actor === undefined || actor.principal.clientId !== principal.clientId)
|
|
15
18
|
throw new BrokerRefusal("stale_lease", "Session does not name an owned live session");
|
|
16
19
|
return actor;
|
|
17
20
|
}
|
|
@@ -125,7 +128,7 @@ export class BrokerAuthority {
|
|
|
125
128
|
/** Terminal cleanup already removed the session; drop its broker bookkeeping. */
|
|
126
129
|
retire(principal, sessionId) {
|
|
127
130
|
const actor = this.actors.get(sessionId);
|
|
128
|
-
if (actor !== undefined && actor.principal.
|
|
131
|
+
if (actor !== undefined && actor.principal.clientId === principal.clientId)
|
|
129
132
|
this.actors.delete(sessionId);
|
|
130
133
|
}
|
|
131
134
|
async close(principal, sessionId, terminalProven = false) {
|
|
@@ -146,10 +149,27 @@ export class BrokerAuthority {
|
|
|
146
149
|
})();
|
|
147
150
|
return actor.closePromise;
|
|
148
151
|
}
|
|
149
|
-
async
|
|
152
|
+
async closeOwnedSessions(clientId, reason) {
|
|
153
|
+
await Promise.all([...this.actors.values()]
|
|
154
|
+
.filter((actor) => actor.principal.clientId === clientId)
|
|
155
|
+
.map(async (actor) => await this.closeActor(actor, reason)));
|
|
156
|
+
}
|
|
157
|
+
async disconnect(principal, explicit = false) {
|
|
150
158
|
for (const admission of this.admissions.values())
|
|
151
159
|
if (admission.clientId === principal.clientId)
|
|
152
160
|
admission.abort.abort();
|
|
161
|
+
if (explicit || this.actors.size === 0) {
|
|
162
|
+
await this.closeOwnedSessions(principal.clientId, "disconnect");
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
// A dropped socket gets a short grace so a tab family is not torn down for
|
|
166
|
+
// a momentary blip. The reconnecting client starts fresh either way.
|
|
167
|
+
const clientId = principal.clientId;
|
|
168
|
+
this.pendingGraceCloses.add(clientId);
|
|
169
|
+
const timer = setTimeout(() => {
|
|
170
|
+
void this.closeOwnedSessions(clientId, "disconnect").finally(() => this.pendingGraceCloses.delete(clientId));
|
|
171
|
+
}, CONNECTION_SESSION_GRACE_MS);
|
|
172
|
+
timer.unref();
|
|
153
173
|
}
|
|
154
174
|
/** Signal shutdown fences every session, including clients whose sockets
|
|
155
175
|
* remain connected. Expiry teardown closes tabs without waiting for a
|
|
@@ -170,7 +190,7 @@ export class BrokerAuthority {
|
|
|
170
190
|
return {
|
|
171
191
|
sessions: this.actors.size,
|
|
172
192
|
admitting: this.admissions.size,
|
|
173
|
-
closing:
|
|
193
|
+
closing: this.pendingGraceCloses.size,
|
|
174
194
|
};
|
|
175
195
|
}
|
|
176
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authority.js","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"authority.js","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,14 @@ export declare function brokerSocketPath(profileDir?: string): string;
|
|
|
4
4
|
export declare function resolveBrokerSocket(profileDir?: string): string;
|
|
5
5
|
export declare function isUnavailable(error: unknown): boolean;
|
|
6
6
|
export declare function isBrowserContentionRefusal(error: unknown): boolean;
|
|
7
|
+
export declare function liveUnixSocket(path: string): Promise<boolean>;
|
|
7
8
|
export declare function brokerEnvironment(env: NodeJS.ProcessEnv, path: string): NodeJS.ProcessEnv;
|
|
8
9
|
export interface BrokerConnectOptions {
|
|
9
10
|
accountId?: string | undefined;
|
|
10
11
|
agentSessionToken?: string | undefined;
|
|
11
12
|
}
|
|
12
13
|
export declare function connectOrLaunchBroker(path: string, options?: BrokerConnectOptions): Promise<BrokerClient>;
|
|
14
|
+
/** Start the elected broker if needed, then wait for its shared MCP socket.
|
|
15
|
+
* Does not open a wire session — a probe connection would start last-close grace. */
|
|
16
|
+
export declare function ensureSharedMcp(path?: string): Promise<void>;
|
|
13
17
|
//# sourceMappingURL=discovery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/discovery.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAA0B,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/discovery.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAA0B,MAAM,gBAAgB,CAAC;AAQtE,wBAAgB,mBAAmB,CAAC,UAAU,SAAsB,GAAG,MAAM,CAG5E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,SAAsB,GAAG,MAAM,CAEzE;AAED,wBAAgB,mBAAmB,CAAC,UAAU,SAAsB,GAAG,MAAM,CAS5E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGrD;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGlE;AAKD,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAYnE;AAmDD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAEzF;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC;AAyBD,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,YAAY,CAAC,CAWnH;AAED;qFACqF;AACrF,wBAAsB,eAAe,CAAC,IAAI,SAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAejF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { spawn, execFileSync } from "node:child_process";
|
|
3
3
|
import { closeSync, lstatSync, openSync, readFileSync } from "node:fs";
|
|
4
|
-
import {
|
|
4
|
+
import { createConnection } from "node:net";
|
|
5
5
|
import { dirname, join } from "node:path";
|
|
6
6
|
import { fileURLToPath } from "node:url";
|
|
7
7
|
import { mkdirSync } from "node:fs";
|
|
@@ -9,6 +9,7 @@ import { currentProfileDir, ProfileBusyError, profilePathIdentity } from "../pro
|
|
|
9
9
|
import { BrokerClient, brokerSpeaksLegacyWire } from "./transport.js";
|
|
10
10
|
import { readBrokerAccountBinding } from "./account-binding.js";
|
|
11
11
|
import { BrokerRefusal } from "./refusal.js";
|
|
12
|
+
import { sharedMcpSocketPath } from "./mcp-socket-path.js";
|
|
12
13
|
const BROKER_CONNECT_TIMEOUT_MS = 10_000;
|
|
13
14
|
const BROKER_CONNECT_POLL_MS = 100;
|
|
14
15
|
export function defaultBrokerSocket(profileDir = currentProfileDir()) {
|
|
@@ -38,6 +39,19 @@ export function isBrowserContentionRefusal(error) {
|
|
|
38
39
|
(error.code === "broker_unavailable" || error.code === "profile_busy");
|
|
39
40
|
}
|
|
40
41
|
const sleep = async (ms) => await new Promise((resolve) => setTimeout(resolve, ms));
|
|
42
|
+
export async function liveUnixSocket(path) {
|
|
43
|
+
return await new Promise((resolve) => {
|
|
44
|
+
const probe = createConnection(path);
|
|
45
|
+
probe.once("connect", () => {
|
|
46
|
+
probe.destroy();
|
|
47
|
+
resolve(true);
|
|
48
|
+
});
|
|
49
|
+
probe.once("error", () => {
|
|
50
|
+
probe.destroy();
|
|
51
|
+
resolve(false);
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
}
|
|
41
55
|
/** Upgrade only: identify the old daemon from its live Unix listener, rather
|
|
42
56
|
* than reading any of its four recorded ownership files. */
|
|
43
57
|
function legacyBrokerPid(path) {
|
|
@@ -106,14 +120,7 @@ async function waitForBroker(path, failure) {
|
|
|
106
120
|
export function brokerEnvironment(env, path) {
|
|
107
121
|
return { ...env, TRUSTY_SQUIRE_BROKER_SOCKET: path };
|
|
108
122
|
}
|
|
109
|
-
|
|
110
|
-
try {
|
|
111
|
-
return await BrokerClient.connect(path);
|
|
112
|
-
}
|
|
113
|
-
catch (error) {
|
|
114
|
-
if (!isUnavailable(error) && !(await reclaimLegacyBroker(path, options, error)))
|
|
115
|
-
throw error;
|
|
116
|
-
}
|
|
123
|
+
function launchBrokerDaemon(path) {
|
|
117
124
|
// Launches may race. Each daemon claims the same kernel SQLite lock before it
|
|
118
125
|
// touches Chrome or the socket; losers exit while clients attach to winner.
|
|
119
126
|
const logPath = join(dirname(path), "broker.log");
|
|
@@ -141,8 +148,19 @@ export async function connectOrLaunchBroker(path, options = {}) {
|
|
|
141
148
|
failure = new BrokerRefusal("broker_unavailable", `Broker exited before attachment (${signal ?? code})`);
|
|
142
149
|
});
|
|
143
150
|
child.unref();
|
|
151
|
+
return () => failure;
|
|
152
|
+
}
|
|
153
|
+
export async function connectOrLaunchBroker(path, options = {}) {
|
|
154
|
+
try {
|
|
155
|
+
return await BrokerClient.connect(path);
|
|
156
|
+
}
|
|
157
|
+
catch (error) {
|
|
158
|
+
if (!isUnavailable(error) && !(await reclaimLegacyBroker(path, options, error)))
|
|
159
|
+
throw error;
|
|
160
|
+
}
|
|
161
|
+
const failure = launchBrokerDaemon(path);
|
|
144
162
|
try {
|
|
145
|
-
return await waitForBroker(path,
|
|
163
|
+
return await waitForBroker(path, failure);
|
|
146
164
|
}
|
|
147
165
|
catch (error) {
|
|
148
166
|
if (error instanceof ProfileBusyError)
|
|
@@ -150,4 +168,22 @@ export async function connectOrLaunchBroker(path, options = {}) {
|
|
|
150
168
|
throw error;
|
|
151
169
|
}
|
|
152
170
|
}
|
|
171
|
+
/** Start the elected broker if needed, then wait for its shared MCP socket.
|
|
172
|
+
* Does not open a wire session — a probe connection would start last-close grace. */
|
|
173
|
+
export async function ensureSharedMcp(path = sharedMcpSocketPath()) {
|
|
174
|
+
if (await liveUnixSocket(path))
|
|
175
|
+
return;
|
|
176
|
+
const wire = resolveBrokerSocket();
|
|
177
|
+
const failure = (await liveUnixSocket(wire)) ? undefined : launchBrokerDaemon(wire);
|
|
178
|
+
const deadline = Date.now() + BROKER_CONNECT_TIMEOUT_MS;
|
|
179
|
+
while (Date.now() < deadline) {
|
|
180
|
+
const launchFailure = failure?.();
|
|
181
|
+
if (launchFailure !== undefined)
|
|
182
|
+
throw launchFailure;
|
|
183
|
+
if (await liveUnixSocket(path))
|
|
184
|
+
return;
|
|
185
|
+
await sleep(BROKER_CONNECT_POLL_MS);
|
|
186
|
+
}
|
|
187
|
+
throw new BrokerRefusal("broker_unavailable", "Shared MCP socket did not become available within 10 seconds");
|
|
188
|
+
}
|
|
153
189
|
//# sourceMappingURL=discovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/bot/broker/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/bot/broker/discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/forwarder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAU7C,qBAAa,oBAAqB,SAAQ,aAAa;IAGnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;gBADxC,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAK3C;AAoDD;;+DAE+D;AAC/D,qBAAa,iBAAiB;IAO1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8C;gBAEzD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,YAAY;IAEtC,OAAO,CAAC,OAAO;IAuBf;;;;;OAKG;YACW,WAAW;IAcnB,MAAM,CACV,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,SAAS,GAAE,MAAqB,EAChC,MAAM,CAAC,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/forwarder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAU7C,qBAAa,oBAAqB,SAAQ,aAAa;IAGnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;gBADxC,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAK3C;AAoDD;;+DAE+D;AAC/D,qBAAa,iBAAiB;IAO1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8C;gBAEzD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,YAAY;IAEtC,OAAO,CAAC,OAAO;IAuBf;;;;;OAKG;YACW,WAAW;IAcnB,MAAM,CACV,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,SAAS,GAAE,MAAqB,EAChC,MAAM,CAAC,EAAE,WAAW,EACpB,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,OAAO,CAAC;IAsMnB,YAAY,IAAI,MAAM;IAGtB,SAAS,IAAI,OAAO;IAGd,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAS7B"}
|
|
@@ -125,16 +125,22 @@ export class OperatorForwarder {
|
|
|
125
125
|
return refused;
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
let reconnecting = false;
|
|
128
129
|
if (this.connection !== undefined) {
|
|
129
130
|
const existing = await awaitOperatorPreparation(this.connection.catch(() => undefined), signal);
|
|
130
131
|
checkCancelled();
|
|
131
132
|
if (existing === undefined || !existing.isConnected()) {
|
|
132
133
|
this.connection = undefined;
|
|
133
134
|
this.client = undefined;
|
|
135
|
+
reconnecting = true;
|
|
134
136
|
}
|
|
135
137
|
}
|
|
136
138
|
const client = await awaitOperatorPreparation(this.connect(), signal);
|
|
137
139
|
checkCancelled();
|
|
140
|
+
// A fresh connection owns no sessions: its ids belong to the lost socket
|
|
141
|
+
// and the broker refuses them.
|
|
142
|
+
if (reconnecting)
|
|
143
|
+
this.sessions.clear();
|
|
138
144
|
const account = await this.callAccount();
|
|
139
145
|
let args = originalArgs;
|
|
140
146
|
if (name !== "operate_start" &&
|
|
@@ -143,7 +149,7 @@ export class OperatorForwarder {
|
|
|
143
149
|
this.sessions.size === 1)
|
|
144
150
|
args = { ...args, session_id: this.sessions.values().next().value };
|
|
145
151
|
const requested = typeof args.session_id === "string" ? args.session_id : undefined;
|
|
146
|
-
let sessionId = requested;
|
|
152
|
+
let sessionId = requested !== undefined && this.sessions.has(requested) ? requested : undefined;
|
|
147
153
|
checkCancelled();
|
|
148
154
|
// Cancellation is per request, keyed on the dispatched frame id: the broker
|
|
149
155
|
// aborts exactly that command. The socket stays up, so this connection keeps
|
|
@@ -234,7 +240,7 @@ export class OperatorForwarder {
|
|
|
234
240
|
}
|
|
235
241
|
if (name === "operate_finish") {
|
|
236
242
|
if (sessionId === undefined)
|
|
237
|
-
throw new BrokerRefusal("stale_lease", "
|
|
243
|
+
throw new BrokerRefusal("stale_lease", "Session is not owned by this MCP connection");
|
|
238
244
|
const closeRequest = {
|
|
239
245
|
sessionId,
|
|
240
246
|
args,
|
|
@@ -257,7 +263,7 @@ export class OperatorForwarder {
|
|
|
257
263
|
return raw.result;
|
|
258
264
|
}
|
|
259
265
|
if (sessionId === undefined)
|
|
260
|
-
throw new BrokerRefusal("stale_lease", "
|
|
266
|
+
throw new BrokerRefusal("stale_lease", "Session is not owned by this MCP connection");
|
|
261
267
|
const commandRequest = {
|
|
262
268
|
sessionId,
|
|
263
269
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../../../src/bot/broker/forwarder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"forwarder.js","sourceRoot":"","sources":["../../../src/bot/broker/forwarder.ts"],"names":[],"mappings":"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"}
|
|
@@ -119,8 +119,8 @@ export class InProcessOperatorPrincipal {
|
|
|
119
119
|
delete args.url;
|
|
120
120
|
}
|
|
121
121
|
const sessionId = args.session_id;
|
|
122
|
-
if (typeof sessionId !== "string")
|
|
123
|
-
throw new BrokerRefusal("stale_lease", "
|
|
122
|
+
if (typeof sessionId !== "string" || !this.sessions.has(sessionId))
|
|
123
|
+
throw new BrokerRefusal("stale_lease", "Session is not owned by this MCP connection");
|
|
124
124
|
if (name === "operate_finish") {
|
|
125
125
|
const reply = await dispatch("close", { sessionId, args, ...(account ? { account } : {}) });
|
|
126
126
|
if (!record(reply))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-principal.js","sourceRoot":"","sources":["../../../src/bot/broker/mcp-principal.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mcp-principal.js","sourceRoot":"","sources":["../../../src/bot/broker/mcp-principal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAqB,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAuB,MAAM,gBAAgB,CAAC;AAIzE,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,sFAAsF;AACtF,MAAM,OAAO,0BAA0B;IAM1B;IACQ;IACA;IAPF,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7B,aAAa,GAAG,IAAI,GAAG,EAAmC,CAAC;IACpE,MAAM,GAAG,KAAK,CAAC;IAEvB,YACW,SAA0B,EAClB,QAAwB,EACxB,KAAmB;QAF3B,cAAS,GAAT,SAAS,CAAiB;QAClB,aAAQ,GAAR,QAAQ,CAAgB;QACxB,UAAK,GAAL,KAAK,CAAc;IACnC,CAAC;IAEI,KAAK,CAAC,OAAO;QACnB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,EAAE,UAAU,IAAI,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,YAAY;YAC/E,CAAC,CAAC;gBACE,SAAS,EAAE,OAAO,CAAC,UAAU;gBAC7B,iBAAiB,EAAE,OAAO,CAAC,mBAAmB;gBAC9C,UAAU,EAAE,OAAO,CAAC,YAAY;aACjC;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,YAAqC,EACrC,SAAS,GAAG,UAAU,EAAE,EACxB,MAAoB,EACpB,UAA2B;QAE3B,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,aAAa,CAAC,aAAa,EAAE,0BAA0B,CAAC,CAAC;QACpF,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,MAAM,CAAC,MAAM,CAAC;QACzC,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC;QAC1C,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACvE,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YACnD,IAAI,IAAI,KAAK,gBAAgB;gBAAE,OAAO,OAAO,CAAC;YAC9C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO;gBACL,UAAU,EAAE,SAAS;gBACrB,YAAY,EAAE,UAAU,EAAE;gBAC1B,SAAS,EAAE,WAAW;gBACtB,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,IAAI;gBACZ,GAAG,EAAE,EAAE;aACR,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,IAAI,GAAG,YAAY,CAAC;QACxB,IACE,IAAI,KAAK,eAAe;YACxB,IAAI,CAAC,UAAU,KAAK,SAAS;YAC7B,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;YAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;YAExB,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;QACtE,MAAM,QAAQ,GAAG,KAAK,EACpB,MAAoC,EACpC,MAA+B,EAC/B,EAAE,GAAG,SAAS,EACd,EAAE;YACF,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YAC/D,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC;gBACH,IAAI,MAAM,EAAE,OAAO;oBAAE,MAAM,MAAM,CAAC,MAAM,CAAC;gBACzC,OAAO,MAAM,oBAAoB,CAC/B,OAAO,EAAE,SAAS,IAAI,IAAI,EAC1B,KAAK,IAAI,EAAE,CACT,MAAM,kBAAkB,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAC9C,MAAM,KAAK,OAAO;oBAChB,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;oBAC9D,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CACvC,IAAI,CAAC,SAAS,EACd,EAAE,EACF,KAAK,EAAE,gBAAgB,EAAE,EAAE;wBACzB,IAAI,MAAM,EAAE,OAAO;4BAAE,OAAO,EAAE,CAAC;wBAC/B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC7B,IAAI,CAAC,SAAS,EACd,MAAM,EACN,MAAM,EACN,EAAE,EACF,gBAAgB,CACjB,CAAC;oBACJ,CAAC,CACF,CACN,CACJ,CAAC;YACJ,CAAC;oBAAS,CAAC;gBACT,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAChD,CAAC;QACH,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,KAAK,EAAE,MAA+B,EAAE,EAAE,GAAG,SAAS,EAAE,EAAE;YACrE,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACzF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;gBAC9C,MAAM,IAAI,aAAa,CAAC,uBAAuB,EAAE,uCAAuC,CAAC,CAAC;YAC5F,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;iBACvE,IACH,OAAO,KAAK,CAAC,WAAW,CAAC,UAAU,KAAK,QAAQ;gBAChD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC;gBAEpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YAC1E,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QACF,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;YAC7B,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;gBACtC,MAAM,IAAI,aAAa,CAAC,mBAAmB,EAAE,oCAAoC,CAAC,CAAC;YACrF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC;gBACvB,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvF,GAAG,CAAC,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjE,CAAC,CAAC;YACH,OAAO,KAAK,CAAC,WAAW,CAAC;QAC3B,CAAC;QACD,IACE,IAAI,KAAK,eAAe;YACxB,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;YAC5B,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EACnC,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,IAAI,CACtB,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,kBAAkB,EAAE,OAAO,EAAE,EACrD,GAAG,SAAS,OAAO,CACpB,CAAC;YACF,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;gBACxC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAsC,CAAC;gBACjE,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,OAAO;oBACL,MAAM,EAAE,aAAa;oBACrB,KAAK,EAAE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB;oBACrE,WAAW;oBACX,UAAU,EAAE,EAAE;oBACd,IAAI,EAAE,aAAa;oBACnB,SAAS,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;oBAC1B,KAAK,EAAE,CAAC;oBACR,OAAO,EAAE,CAAC;oBACV,SAAS,EAAE,CAAC;oBACZ,GAAG,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvF,CAAC;YACJ,CAAC;YACD,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC,GAAG,CAAC;QAClB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;YAChE,MAAM,IAAI,aAAa,CAAC,aAAa,EAAE,6CAA6C,CAAC,CAAC;QACxF,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAAE,MAAM,IAAI,aAAa,CAAC,uBAAuB,EAAE,qBAAqB,CAAC,CAAC;YAC5F,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI;gBAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC3D,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;QACD,MAAM,MAAM,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,aAAa,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,CAAC;QAC9F,IAAI,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,KAAK,CAAC,kBAAkB,CAAC,KAAK,KAAK,WAAW;YACpF,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,6BAA6B,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;CACF"}
|
|
@@ -5,7 +5,7 @@ import { dirname } from "node:path";
|
|
|
5
5
|
import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
|
|
6
6
|
import { ApiClient } from "../../api-client.js";
|
|
7
7
|
import { buildServer, createServerCallAdmission, runBoundedServerCleanup } from "../../server.js";
|
|
8
|
-
import { shutdownDeadlineMs } from "../../server
|
|
8
|
+
import { shutdownDeadlineMs } from "../../server.js";
|
|
9
9
|
import { createSessionGuard } from "../../session-guard.js";
|
|
10
10
|
import { InProcessOperatorPrincipal } from "./mcp-principal.js";
|
|
11
11
|
import { sharedMcpSocketPath } from "./mcp-socket-path.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-socket.js","sourceRoot":"","sources":["../../../src/bot/broker/mcp-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAyC,MAAM,UAAU,CAAC;AACjG,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"mcp-socket.js","sourceRoot":"","sources":["../../../src/bot/broker/mcp-socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/protocol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/protocol.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,mFAAmF;AACnF,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEnF;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;cAEc;AACd,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,8DAA8D;AAC9D,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;;;;;;;;;;;;mDAe+C;IAC/C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AACD,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,2DAA2D;AAC3D,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B;;;;OAIG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AACD,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,kBAAkB,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,gBAAgB,CAAA;KAAE,CAAC;CACpE;AAED,2EAA2E;AAC3E,MAAM,WAAW,YAAY;IAC3B,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,+EAA+E;IAC/E,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AACD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,gBAAgB,CAAA;KAAE,CAAC;CACpE;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,MAAM,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C;AAED,2EAA2E;AAC3E,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC"}
|
|
@@ -14,7 +14,8 @@
|
|
|
14
14
|
// cancel -> the reserved `abort` control frame
|
|
15
15
|
//
|
|
16
16
|
// Framing, MAX_FRAME, the `{ id, error: { code, message } }` error shape, the
|
|
17
|
-
// 512-entry retained-result replay guard
|
|
17
|
+
// 512-entry retained-result replay guard, the 5 s connection-session grace
|
|
18
|
+
// timer and the reserved `abort` control frame (per-request cancellation keyed
|
|
18
19
|
// on the request frame id) are transport/implementation policy, not part of
|
|
19
20
|
// this contract. They stay behind it.
|
|
20
21
|
//
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/bot/broker/protocol.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,EAAE;AACF,yEAAyE;AACzE,sEAAsE;AACtE,2EAA2E;AAC3E,2EAA2E;AAC3E,2CAA2C;AAC3C,EAAE;AACF,4CAA4C;AAC5C,yCAAyC;AACzC,mFAAmF;AACnF,6DAA6D;AAC7D,wFAAwF;AACxF,uEAAuE;AACvE,EAAE;AACF,8EAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/bot/broker/protocol.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,EAAE;AACF,yEAAyE;AACzE,sEAAsE;AACtE,2EAA2E;AAC3E,2EAA2E;AAC3E,2CAA2C;AAC3C,EAAE;AACF,4CAA4C;AAC5C,yCAAyC;AACzC,mFAAmF;AACnF,6DAA6D;AAC7D,wFAAwF;AACxF,uEAAuE;AACvE,EAAE;AACF,8EAA8E;AAC9E,2EAA2E;AAC3E,+EAA+E;AAC/E,4EAA4E;AAC5E,sCAAsC;AACtC,EAAE;AACF,gFAAgF;AAChF,8EAA8E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/transport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/transport.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAkB,aAAa,EAAE,MAAM,eAAe,CAAC;AAoBvF,MAAM,MAAM,cAAc,GAAG,CAC3B,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACtC,IAAI,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,KAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,wBAAgB,cAAc,IAAI,cAAc,GAAG,SAAS,CAE3D;AACD,wBAAsB,kBAAkB,CAAC,CAAC,EACxC,MAAM,EAAE,cAAc,GAAG,SAAS,EAClC,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACrB,OAAO,CAAC,CAAC,CAAC,CAEZ;AAyCD,MAAM,WAAW,mBAAmB;IAClC;yBACqB;IACrB,SAAS,CAAC,CACR,SAAS,EAAE,eAAe,EAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC5E,IAAI,CACF,SAAS,EAAE,eAAe,EAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB;+DAC2D;IAC3D,KAAK,CAAC,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/D,UAAU,CAAC,SAAS,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAID;;;;2EAI2E;AAC3E,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA+C1F;AAYD,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAAC;IACT,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC,CA2ID;AAED,qBAAa,YAAY;IAcH,OAAO,CAAC,QAAQ,CAAC,MAAM;IAb3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CASpB;IACJ,OAAO,CAAC,KAAK,CAAS;IACtB,0BAA0B;IAC1B,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IACnC,OAAO;WAoCM,OAAO,CAClB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAAO,GAC7D,OAAO,CAAC,YAAY,CAAC;IAgCxB,IAAI,CACF,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,EAAE,GAAE,MAAqB,EACzB,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,OAAO,CAAC;IAsBnB,sEAAsE;IAChE,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,WAAW,IAAI,OAAO;IAIhB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ/B"}
|