@trusty-squire/mcp 1.1.18 → 1.1.19-rc.2

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.
Files changed (44) hide show
  1. package/dist/bin.js +7 -12
  2. package/dist/bin.js.map +1 -1
  3. package/dist/bot/broker/authority.d.ts +6 -2
  4. package/dist/bot/broker/authority.d.ts.map +1 -1
  5. package/dist/bot/broker/authority.js +25 -5
  6. package/dist/bot/broker/authority.js.map +1 -1
  7. package/dist/bot/broker/discovery.d.ts +15 -0
  8. package/dist/bot/broker/discovery.d.ts.map +1 -1
  9. package/dist/bot/broker/discovery.js +142 -7
  10. package/dist/bot/broker/discovery.js.map +1 -1
  11. package/dist/bot/broker/forwarder.d.ts.map +1 -1
  12. package/dist/bot/broker/forwarder.js +9 -3
  13. package/dist/bot/broker/forwarder.js.map +1 -1
  14. package/dist/bot/broker/mcp-principal.js +2 -2
  15. package/dist/bot/broker/mcp-principal.js.map +1 -1
  16. package/dist/bot/broker/mcp-socket.js +1 -1
  17. package/dist/bot/broker/mcp-socket.js.map +1 -1
  18. package/dist/bot/broker/protocol.d.ts.map +1 -1
  19. package/dist/bot/broker/protocol.js +2 -1
  20. package/dist/bot/broker/protocol.js.map +1 -1
  21. package/dist/bot/broker/transport.d.ts.map +1 -1
  22. package/dist/bot/broker/transport.js +4 -5
  23. package/dist/bot/broker/transport.js.map +1 -1
  24. package/dist/bot/session/lifecycle.d.ts.map +1 -1
  25. package/dist/bot/session/lifecycle.js +3 -30
  26. package/dist/bot/session/lifecycle.js.map +1 -1
  27. package/dist/bot/session/model.d.ts.map +1 -1
  28. package/dist/bot/session/model.js.map +1 -1
  29. package/dist/relay.d.ts.map +1 -1
  30. package/dist/relay.js +26 -3
  31. package/dist/relay.js.map +1 -1
  32. package/dist/server.d.ts +1 -3
  33. package/dist/server.d.ts.map +1 -1
  34. package/dist/server.js +11 -239
  35. package/dist/server.js.map +1 -1
  36. package/package.json +1 -1
  37. package/dist/bot/broker/agent-identity.d.ts +0 -4
  38. package/dist/bot/broker/agent-identity.d.ts.map +0 -1
  39. package/dist/bot/broker/agent-identity.js +0 -12
  40. package/dist/bot/broker/agent-identity.js.map +0 -1
  41. package/dist/server-instance-registry.d.ts +0 -115
  42. package/dist/server-instance-registry.d.ts.map +0 -1
  43. package/dist/server-instance-registry.js +0 -405
  44. 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 exits from runServer's disconnect/signal shutdown
65
- // path; `skill` returns its own code via T30 taxonomy.
66
- if (!isServer && !isBroker && !isRelay)
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":"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"}
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,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,QAAQ,EAAE,CAAC;QACjB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACpD,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IACnB,OAAO,CAAC,CAAC;AACX,CAAC;AAED,QAAQ,EAAE;KACP,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;IACb,iEAAiE;IACjE,sEAAsE;IACtE,mCAAmC;IACnC,8DAA8D;IAC9D,gEAAgE;IAChE,gCAAgC;IAChC,EAAE;IACF,sEAAsE;IACtE,sEAAsE;IACtE,qEAAqE;IACrE,IAAI,QAAQ,IAAI,OAAO;QAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC,QAAQ;QAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;KACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;IACtB,4DAA4D;IAC5D,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;QAC/D,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5C,OAAO,CAAC,KAAK,CACX,mBAAmB,OAAO,WAAW,GAAG,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAC3F,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
package/dist/bot/broker/authority.d.ts CHANGED
@@ -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 agent that opened it: there are no capabilities,
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
- disconnect(principal: BrokerPrincipal, _explicit?: boolean): Promise<void>;
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. */
package/dist/bot/broker/authority.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"authority.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"authority.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"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"}
package/dist/bot/broker/authority.js CHANGED
@@ -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 agent that opened it: there are no capabilities,
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.agentId !== principal.agentId)
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.agentId === principal.agentId)
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 disconnect(principal, _explicit = false) {
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: 0,
193
+ closing: this.pendingGraceCloses.size,
174
194
  };
175
195
  }
176
196
  }
package/dist/bot/broker/authority.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"authority.js","sourceRoot":"","sources":["../../../src/bot/broker/authority.ts"],"names":[],"mappings":"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"}
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;AA6B7C,+EAA+E;AAC/E,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAgBjD;;;;iCAIiC;AACjC,MAAM,OAAO,eAAe;IACT,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;IAClC,UAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC1C,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEhD,OAAO,CAAC,SAA0B,EAAE,SAAiB;QAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ;YACxE,MAAM,IAAI,aAAa,CAAC,aAAa,EAAE,6CAA6C,CAAC,CAAC;QACxF,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;oCAEgC;IAChC,KAAK,CAAC,IAAI,CACR,SAA0B,EAC1B,MAA8E,EAC9E,sBAAgE,EAChE,qBAA4D,EAC5D,aAA2B;QAE3B,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,sBAAsB,CAAC;YACtC,KAAK,CAAC,MAAM;YACZ,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,IAAI,IAAmC,CAAC;QACxC,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAChC,MAAM,KAAK,GAAU;gBACnB,SAAS,EAAE,EAAE,GAAG,SAAS,EAAE;gBAC3B,SAAS,EAAE,EAAE;gBACb,IAAI;gBACJ,KAAK;gBACL,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;gBACvB,OAAO,EAAE,CAAC;aACX,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC7B,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,sCAAsC,CAAC,CAAC;YAC/E,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,MAAM,MAAM,GAAG,CAAC,MAAM,sBAAsB,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC;gBAC7D,IAAI,CAAC,MAAM;oBAAE,MAAM,qBAAqB,EAAE,CAAC,EAAE,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,QAAQ,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,eAAe,CACb,SAA0B,EAC1B,SAAiB;QAEjB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACjD,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC1C,OAAO;YACL,UAAU,EAAE,SAAS;YACrB,MAAM,EAAE,cAAc;YACtB,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,KAAK;SACd,CAAC;IACJ,CAAC;IAED,MAAM,CACJ,SAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,IAAY,EACZ,IAA6B,EAC7B,aAA2B,EAC3B,OAAuB;QAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC;YAC/E,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,UAAU,EAAE,SAAS;gBACrB,MAAM,EAAE,cAAc;gBACtB,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;QACL,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC;QACpC,MAAM,QAAQ,GAAG,sBAAsB,CAAC;YACtC,eAAe,CAAC,MAAM;YACtB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/B,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC;QAChC,MAAM,WAAW,GACf,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS;YAC9B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC1B,IAAI,MAAM,CAAC,OAAO;oBAAE,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;gBAClF,OAAO,KAAK,CAAC,IAAI,CAAC,OAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;QACT,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;QACnB,MAAM,cAAc,GAAG,KAAK,EAAE,QAAiB,EAAoB,EAAE;YACnE,IAAI,MAAM,CAAC,OAAO;gBAAE,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,gCAAgC,CAAC,CAAC;YAC3F,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9F,CAAC,CAAC;QACF,MAAM,MAAM,GACV,WAAW,KAAK,SAAS;YACvB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACpD,CAAC,CAAC,WAAW,CAAC,IAAI,CACd,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAC/D,CAAC,KAAc,EAAE,EAAE,CACjB,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrB,MAAM,KAAK,CAAC;YACd,CAAC,CAAC,CACL,CAAC;QACR,KAAK,CAAC,IAAI,GAAG,MAAM;aAChB,IAAI,CACH,GAAG,EAAE,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,SAAS,CAChB;aACA,OAAO,CAAC,GAAG,EAAE;YACZ,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;YACnB,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QACL,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;4EACwE;IACxE,KAAK,CAAC,MAAM,CACV,SAA0B,EAC1B,SAAiB,EACjB,SAAiB,EACjB,IAA6B,EAC7B,OAAuB;QAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACjD,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC;QACvE,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAC5B,gBAAgB,EAChB,IAAI,EACJ,IAAI,eAAe,EAAE,CAAC,MAAM,EAC5B,SAAS,EACT,SAAS,EACT,OAAO,EACP,SAAS,CACV,CAAC;IACJ,CAAC;IAED,iFAAiF;IACjF,MAAM,CAAC,SAA0B,EAAE,SAAiB;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ;YACxE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,KAAK,CACT,SAA0B,EAC1B,SAAiB,EACjB,cAAc,GAAG,KAAK;QAEtB,IAAI,cAAc,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO,IAAI,CAAC;QAC/D,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAEO,UAAU,CAChB,KAAY,EACZ,SAAkC,YAAY;QAE9C,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC,YAAY,CAAC;QAChE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,CAAC,YAAY,GAAG,CAAC,KAAK,IAAI,EAAE;YAC/B,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,MAAM;gBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAChD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,KAAK,CAAC,YAAY,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,QAAgB,EAAE,MAA+B;QAChF,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;aACtB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,QAAQ,CAAC;aACxD,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAA0B,EAAE,QAAQ,GAAG,KAAK;QAC3D,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC9C,IAAI,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ;gBAAE,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzE,IAAI,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAChE,OAAO;QACT,CAAC;QACD,2EAA2E;QAC3E,qEAAqE;QACrE,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,KAAK,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAChE,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CACzC,CAAC;QACJ,CAAC,EAAE,2BAA2B,CAAC,CAAC;QAChC,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED;;wDAEoD;IACpD,KAAK,CAAC,QAAQ;QACZ,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC9C,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,MAAM;YACxB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAAC;QACjF,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACzB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACnE,IAAI,MAAM;gBAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YAC1B,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;YAC/B,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;SACtC,CAAC;IACJ,CAAC;CACF"}
package/dist/bot/broker/discovery.d.ts CHANGED
@@ -4,10 +4,25 @@ 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;
9
+ export interface ManagedBrokerUnit {
10
+ id: string;
11
+ activeState: string;
12
+ execStart: string;
13
+ environment: Record<string, string>;
14
+ }
15
+ /** True when discovery must wait for this unit instead of launching on demand. */
16
+ export declare function unitDefersOnDemandLaunch(unit: ManagedBrokerUnit, profileDir: string): boolean;
17
+ /** Parse `systemctl --user show --type=service` property blocks. */
18
+ export declare function parseManagedBrokerShow(stdout: string): ManagedBrokerUnit[];
19
+ export declare function managedBrokerUnitIsLive(profileDir?: string): boolean;
8
20
  export interface BrokerConnectOptions {
9
21
  accountId?: string | undefined;
10
22
  agentSessionToken?: string | undefined;
11
23
  }
12
24
  export declare function connectOrLaunchBroker(path: string, options?: BrokerConnectOptions): Promise<BrokerClient>;
25
+ /** Start the elected broker if needed, then wait for its shared MCP socket.
26
+ * Does not open a wire session — a probe connection would start last-close grace. */
27
+ export declare function ensureSharedMcp(path?: string): Promise<void>;
13
28
  //# sourceMappingURL=discovery.d.ts.map
package/dist/bot/broker/discovery.d.ts.map CHANGED
@@ -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;AAOtE,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;AAsDD,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;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,YAAY,CAAC,CA6BnH"}
1
+ {"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/bot/broker/discovery.ts"],"names":[],"mappings":"AASA,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,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAyCD,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAE7F;AAED,oEAAoE;AACpE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAyB1E;AAED,wBAAgB,uBAAuB,CAAC,UAAU,SAAsB,GAAG,OAAO,CAoBjF;AASD,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"}
package/dist/bot/broker/discovery.js CHANGED
@@ -1,14 +1,16 @@
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 { hostname } from "node:os";
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";
8
+ import { homedir } from "node:os";
8
9
  import { currentProfileDir, ProfileBusyError, profilePathIdentity } from "../profile.js";
9
10
  import { BrokerClient, brokerSpeaksLegacyWire } from "./transport.js";
10
11
  import { readBrokerAccountBinding } from "./account-binding.js";
11
12
  import { BrokerRefusal } from "./refusal.js";
13
+ import { sharedMcpSocketPath } from "./mcp-socket-path.js";
12
14
  const BROKER_CONNECT_TIMEOUT_MS = 10_000;
13
15
  const BROKER_CONNECT_POLL_MS = 100;
14
16
  export function defaultBrokerSocket(profileDir = currentProfileDir()) {
@@ -38,6 +40,19 @@ export function isBrowserContentionRefusal(error) {
38
40
  (error.code === "broker_unavailable" || error.code === "profile_busy");
39
41
  }
40
42
  const sleep = async (ms) => await new Promise((resolve) => setTimeout(resolve, ms));
43
+ export async function liveUnixSocket(path) {
44
+ return await new Promise((resolve) => {
45
+ const probe = createConnection(path);
46
+ probe.once("connect", () => {
47
+ probe.destroy();
48
+ resolve(true);
49
+ });
50
+ probe.once("error", () => {
51
+ probe.destroy();
52
+ resolve(false);
53
+ });
54
+ });
55
+ }
41
56
  /** Upgrade only: identify the old daemon from its live Unix listener, rather
42
57
  * than reading any of its four recorded ownership files. */
43
58
  function legacyBrokerPid(path) {
@@ -106,14 +121,105 @@ async function waitForBroker(path, failure) {
106
121
  export function brokerEnvironment(env, path) {
107
122
  return { ...env, TRUSTY_SQUIRE_BROKER_SOCKET: path };
108
123
  }
109
- export async function connectOrLaunchBroker(path, options = {}) {
124
+ function execStartArgv(execStart) {
125
+ const listed = /argv\[\]=([^;]*)/.exec(execStart)?.[1] ?? "";
126
+ return listed.trim().split(/\s+/).filter(Boolean);
127
+ }
128
+ function parseEnvironment(line) {
129
+ const body = line.startsWith("Environment=") ? line.slice("Environment=".length) : line;
130
+ const environment = {};
131
+ for (const part of body.split(" ")) {
132
+ const eq = part.indexOf("=");
133
+ if (eq <= 0)
134
+ continue;
135
+ environment[part.slice(0, eq)] = part.slice(eq + 1);
136
+ }
137
+ return environment;
138
+ }
139
+ function isBrokerUnit(unit) {
140
+ if (unit.id.replace(/\.service$/, "").startsWith("trusty-squire-broker"))
141
+ return true;
142
+ return execStartArgv(unit.execStart).some((arg) => arg === "broker" || arg === "--squire-broker");
143
+ }
144
+ function unitProfileDir(unit) {
145
+ const configured = unit.environment.TRUSTY_SQUIRE_PROFILE_DIR?.trim();
146
+ return configured && configured.length > 0
147
+ ? configured
148
+ : join(homedir(), ".trusty-squire", "chrome-profile");
149
+ }
150
+ function unitServesProfile(unit, profileDir) {
151
+ return isBrokerUnit(unit) &&
152
+ profilePathIdentity(unitProfileDir(unit)) === profilePathIdentity(profileDir);
153
+ }
154
+ function unitIsLive(unit) {
155
+ return unit.activeState === "active" ||
156
+ unit.activeState === "activating" ||
157
+ unit.activeState === "reloading";
158
+ }
159
+ /** True when discovery must wait for this unit instead of launching on demand. */
160
+ export function unitDefersOnDemandLaunch(unit, profileDir) {
161
+ return unitServesProfile(unit, profileDir) && unitIsLive(unit);
162
+ }
163
+ /** Parse `systemctl --user show --type=service` property blocks. */
164
+ export function parseManagedBrokerShow(stdout) {
165
+ const units = [];
166
+ let current = {};
167
+ const take = () => {
168
+ if (current.id === undefined)
169
+ return;
170
+ units.push({
171
+ id: current.id,
172
+ activeState: current.activeState ?? "inactive",
173
+ execStart: current.execStart ?? "",
174
+ environment: current.environment ?? {},
175
+ });
176
+ current = {};
177
+ };
178
+ for (const line of stdout.split("\n")) {
179
+ if (line.length === 0) {
180
+ take();
181
+ continue;
182
+ }
183
+ if (line.startsWith("Id="))
184
+ current.id = line.slice(3);
185
+ else if (line.startsWith("ActiveState="))
186
+ current.activeState = line.slice(12);
187
+ else if (line.startsWith("ExecStart="))
188
+ current.execStart = line.slice(10);
189
+ else if (line.startsWith("Environment="))
190
+ current.environment = parseEnvironment(line);
191
+ }
192
+ take();
193
+ return units;
194
+ }
195
+ export function managedBrokerUnitIsLive(profileDir = currentProfileDir()) {
196
+ if (process.platform !== "linux")
197
+ return false;
110
198
  try {
111
- return await BrokerClient.connect(path);
199
+ const stdout = execFileSync("systemctl", [
200
+ "--user",
201
+ "show",
202
+ "--type=service",
203
+ "--all",
204
+ "--no-pager",
205
+ "-p", "Id",
206
+ "-p", "ActiveState",
207
+ "-p", "Environment",
208
+ "-p", "ExecStart",
209
+ ], { encoding: "utf8", timeout: 2_000, stdio: ["ignore", "pipe", "ignore"] });
210
+ return parseManagedBrokerShow(stdout).some((unit) => unitServesProfile(unit, profileDir) && unitIsLive(unit));
112
211
  }
113
- catch (error) {
114
- if (!isUnavailable(error) && !(await reclaimLegacyBroker(path, options, error)))
115
- throw error;
212
+ catch {
213
+ return false;
116
214
  }
215
+ }
216
+ function launchUnlessManaged(path) {
217
+ // A systemd user unit that already owns this profile will reclaim the socket
218
+ // itself. Launching a detached competitor wins the kernel lock and the unit
219
+ // restart-loops (relay reconnect after #982).
220
+ return managedBrokerUnitIsLive() ? undefined : launchBrokerDaemon(path);
221
+ }
222
+ function launchBrokerDaemon(path) {
117
223
  // Launches may race. Each daemon claims the same kernel SQLite lock before it
118
224
  // touches Chrome or the socket; losers exit while clients attach to winner.
119
225
  const logPath = join(dirname(path), "broker.log");
@@ -141,8 +247,19 @@ export async function connectOrLaunchBroker(path, options = {}) {
141
247
  failure = new BrokerRefusal("broker_unavailable", `Broker exited before attachment (${signal ?? code})`);
142
248
  });
143
249
  child.unref();
250
+ return () => failure;
251
+ }
252
+ export async function connectOrLaunchBroker(path, options = {}) {
144
253
  try {
145
- return await waitForBroker(path, () => failure);
254
+ return await BrokerClient.connect(path);
255
+ }
256
+ catch (error) {
257
+ if (!isUnavailable(error) && !(await reclaimLegacyBroker(path, options, error)))
258
+ throw error;
259
+ }
260
+ const failure = launchUnlessManaged(path);
261
+ try {
262
+ return await waitForBroker(path, failure);
146
263
  }
147
264
  catch (error) {
148
265
  if (error instanceof ProfileBusyError)
@@ -150,4 +267,22 @@ export async function connectOrLaunchBroker(path, options = {}) {
150
267
  throw error;
151
268
  }
152
269
  }
270
+ /** Start the elected broker if needed, then wait for its shared MCP socket.
271
+ * Does not open a wire session — a probe connection would start last-close grace. */
272
+ export async function ensureSharedMcp(path = sharedMcpSocketPath()) {
273
+ if (await liveUnixSocket(path))
274
+ return;
275
+ const wire = resolveBrokerSocket();
276
+ const failure = (await liveUnixSocket(wire)) ? undefined : launchUnlessManaged(wire);
277
+ const deadline = Date.now() + BROKER_CONNECT_TIMEOUT_MS;
278
+ while (Date.now() < deadline) {
279
+ const launchFailure = failure?.();
280
+ if (launchFailure !== undefined)
281
+ throw launchFailure;
282
+ if (await liveUnixSocket(path))
283
+ return;
284
+ await sleep(BROKER_CONNECT_POLL_MS);
285
+ }
286
+ throw new BrokerRefusal("broker_unavailable", "Shared MCP socket did not become available within 10 seconds");
287
+ }
153
288
  //# sourceMappingURL=discovery.js.map
package/dist/bot/broker/discovery.js.map CHANGED
@@ -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,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,yBAAyB,GAAG,MAAM,CAAC;AACzC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAEnC,MAAM,UAAU,mBAAmB,CAAC,UAAU,GAAG,iBAAiB,EAAE;IAClE,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpG,OAAO,IAAI,CAAC,MAAM,EAAE,wBAAwB,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,OAAO,IAAI,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;AACrG,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAU,GAAG,iBAAiB,EAAE;IAC/D,OAAO,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,EAAE,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAC5F,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,UAAU,GAAG,iBAAiB,EAAE;IAClE,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,IAAI,KAAK,mBAAmB,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,MAAM,EAAE,EAAE;QACrF,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;IACvF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,MAAM,IAAI,GAAI,KAA+B,CAAC,IAAI,CAAC;IACnD,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,aAAa,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACvD,OAAO,KAAK,YAAY,aAAa;QACnC,CAAC,KAAK,CAAC,IAAI,KAAK,oBAAoB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,KAAK,GAAG,KAAK,EAAE,EAAU,EAAiB,EAAE,CAChD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1D;4DAC4D;AAC5D,SAAS,eAAe,CAAC,IAAY;IACnC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;aACpF,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC;QACzF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,GAAG,KAAK,OAAO,CAAC,GAAG;gBAAE,SAAS;YAClC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,GAAG,UAAU,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACtE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAAE,SAAS;YACzC,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,IAAY,EAAE,OAA6B,EAAE,KAAc;IAC5F,IAAI,CAAC,CAAC,KAAK,YAAY,aAAa,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO,KAAK,CAAC;IACrF,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,KAAK,SAAS;QACnD,MAAM,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,KAAK,SAAS;QAC3C,MAAM,wBAAwB,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC;IACjG,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACnC,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,CAAC;QAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;IACrC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QAC/C,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,aAAa,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,+BAA+B,CAAC,CAAC;AACxG,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,OAAiC;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,CAAC;IACxD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,OAAO,EAAE,EAAE,CAAC;QAClC,IAAI,aAAa,KAAK,SAAS;YAAE,MAAM,aAAa,CAAC;QACrD,IAAI,CAAC;YAAC,OAAO,MAAM,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,CAAC;QAChD,OAAO,KAAK,EAAE,CAAC;YAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;QAAC,CAAC;QACzD,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,IAAI,aAAa,CAAC,oBAAoB,EAAE,uFAAuF,CAAC,CAAC;AACzI,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAsB,EAAE,IAAY;IACpE,OAAO,EAAE,GAAG,GAAG,EAAE,2BAA2B,EAAE,IAAI,EAAE,CAAC;AACvD,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,IAAY,EAAE,UAAgC,EAAE;IAC1F,IAAI,CAAC;QAAC,OAAO,MAAM,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,CAAC;IAChD,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAAE,MAAM,KAAK,CAAC;IAC/F,CAAC;IACD,8EAA8E;IAC9E,4EAA4E;IAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC;IAClD,IAAI,KAAyB,CAAC;IAC9B,IAAI,CAAC;QAAC,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,KAAK,GAAG,SAAS,CAAC;IAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE;QACzG,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC;QAChE,GAAG,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC;KAC1C,CAAC,CAAC;IACH,IAAI,KAAK,KAAK,SAAS;QAAE,SAAS,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,OAA0B,CAAC;IAC/B,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAClC,IAAI,IAAI,KAAK,CAAC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,CAAC,yCAAyC;QACpF,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO;QACxC,OAAO,GAAG,IAAI,aAAa,CAAC,oBAAoB,EAAE,oCAAoC,MAAM,IAAI,IAAI,GAAG,CAAC,CAAC;IAC3G,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,IAAI,CAAC;QAAC,OAAO,MAAM,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IACxD,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,gBAAgB;YAAE,OAAO,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/bot/broker/discovery.ts"],"names":[],"mappings":"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"}
package/dist/bot/broker/forwarder.d.ts.map CHANGED
@@ -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;IAiMnB,YAAY,IAAI,MAAM;IAGtB,SAAS,IAAI,OAAO;IAGd,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAS7B"}
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"}
package/dist/bot/broker/forwarder.js CHANGED
@@ -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", "A session id is required");
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", "A session id is required");
266
+ throw new BrokerRefusal("stale_lease", "Session is not owned by this MCP connection");
261
267
  const commandRequest = {
262
268
  sessionId,
263
269
  name,
package/dist/bot/broker/forwarder.js.map CHANGED
@@ -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":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AASlF,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IAG1C;IAFX,YACE,OAAe,EACN,MAA+B;QAExC,KAAK,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;QAF/B,WAAM,GAAN,MAAM,CAAyB;QAGxC,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACrC,CAAC;CACF;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED;;qEAEqE;AACrE,SAAS,yBAAyB,CAAC,SAAiB;IAClD,OAAO;QACL,UAAU,EAAE,SAAS;QACrB,YAAY,EAAE,UAAU,EAAE;QAC1B,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,EAAE;KACR,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,GAAY;IAKlC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAChB,MAAM,IAAI,oBAAoB,CAAC,yCAAyC,EAAE;YACxE,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;IACL,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,iBAAiB,GAAG,WAAW,EAAE,UAAU,CAAC;IAClD,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACvD,MAAM,gBAAgB,GACpB,OAAO,iBAAiB,KAAK,QAAQ;QACrC,iBAAiB,CAAC,MAAM,GAAG,CAAC;QAC5B,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAC/D,IAAI,CAAC,gBAAgB,IAAI,WAAW,KAAK,SAAS;QAChD,MAAM,IAAI,oBAAoB,CAAC,8CAA8C,EAAE;YAC7E,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;YACnC,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;IACL,OAAO;QACL,WAAW;QACX,KAAK;QACL,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC;AACJ,CAAC;AAED;;+DAE+D;AAC/D,MAAM,OAAO,iBAAiB;IAOT;IACA;IAPX,UAAU,CAAoC;IAC9C,MAAM,CAA2B;IACjC,UAAU,GAAG,KAAK,CAAC;IACV,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7B,aAAa,GAAG,IAAI,GAAG,EAAmC,CAAC;IAC5E,YACmB,IAAY,EACZ,KAAmB;QADnB,SAAI,GAAJ,IAAI,CAAQ;QACZ,UAAK,GAAL,KAAK,CAAc;IACnC,CAAC;IACI,OAAO;QACb,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,UAAU,GAAG,CAAC,KAAK,IAAI,EAAE;gBAC5B,uEAAuE;gBACvE,kEAAkE;gBAClE,qEAAqE;gBACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACxC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE;oBACpD,GAAG,CAAC,OAAO,EAAE,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;oBAC/E,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,SAAS;wBAC5C,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC;iBACxD,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;gBACrB,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;gBAChB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,WAAW;QACvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,OAAO,EAAE,UAAU,CAAC;QACtC,MAAM,iBAAiB,GAAG,OAAO,EAAE,mBAAmB,CAAC;QACvD,MAAM,UAAU,GAAG,OAAO,EAAE,YAAY,CAAC;QACzC,IACE,SAAS,KAAK,SAAS;YACvB,iBAAiB,KAAK,SAAS;YAC/B,UAAU,KAAK,SAAS;YACxB,UAAU,CAAC,MAAM,KAAK,CAAC;YAEvB,OAAO,SAAS,CAAC;QACnB,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAC;IACtD,CAAC;IACD,KAAK,CAAC,MAAM,CACV,IAAY,EACZ,YAAqC,EACrC,YAAoB,UAAU,EAAE,EAChC,MAAoB,EACpB,UAA2B;QAE3B,MAAM,cAAc,GAAG,GAAS,EAAE;YAChC,IAAI,MAAM,EAAE,OAAO;gBACjB,MAAM,MAAM,CAAC,MAAM,IAAI,IAAI,aAAa,CAAC,WAAW,EAAE,mCAAmC,CAAC,CAAC;QAC/F,CAAC,CAAC;QACF,cAAc,EAAE,CAAC;QACjB,MAAM,cAAc,GAClB,OAAO,YAAY,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,IAAI,IAAI,KAAK,eAAe,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACvD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;oBAC9B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;oBAC1C,OAAO,yBAAyB,CAAC,cAAc,CAAC,CAAC;gBACnD,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QACD,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAC7C,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EACtC,MAAM,CACP,CAAC;YACF,cAAc,EAAE,CAAC;YACjB,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtD,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;gBAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,YAAY,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QACtE,cAAc,EAAE,CAAC;QACjB,yEAAyE;QACzE,+BAA+B;QAC/B,IAAI,YAAY;YAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzC,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,SAAS,GAAG,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,IAAI,SAAS,GAAG,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QAChG,cAAc,EAAE,CAAC;QAEjB,4EAA4E;QAC5E,6EAA6E;QAC7E,6EAA6E;QAC7E,IAAI,mBAAuC,CAAC;QAC5C,MAAM,eAAe,GAAG,GAAS,EAAE;YACjC,IAAI,mBAAmB,KAAK,SAAS;gBAAE,KAAK,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAChF,CAAC,CAAC;QACF,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,KAAK,EACpB,MAAwB,EACxB,MAA+B,EACb,EAAE;YACpB,MAAM,EAAE,GAAG,MAAM,KAAK,MAAM,IAAI,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3F,mBAAmB,GAAG,EAAE,CAAC;YACzB,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QAC3D,CAAC,CAAC;QACF,IAAI,CAAC;YACH,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC7B,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;oBACtC,MAAM,IAAI,aAAa,CAAC,mBAAmB,EAAE,sCAAsC,CAAC,CAAC;gBACvF,MAAM,WAAW,GAAgB;oBAC/B,UAAU,EAAE,IAAI,CAAC,WAAW;oBAC5B,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvF,GAAG,CAAC,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAChE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;iBAC9C,CAAC;gBACF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAChB,MAAM,IAAI,oBAAoB,CAAC,yCAAyC,EAAE;wBACxE,OAAO,EAAE,SAAS;wBAClB,MAAM,EAAE,KAAK;qBACd,CAAC,CAAC;gBACL,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC5E,MAAM,iBAAiB,GAAG,WAAW,EAAE,UAAU,CAAC;gBAClD,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC5E,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;gBACvD,MAAM,gBAAgB,GACpB,OAAO,iBAAiB,KAAK,QAAQ;oBACrC,iBAAiB,CAAC,MAAM,GAAG,CAAC;oBAC5B,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;gBAC/D,IAAI,CAAC,gBAAgB,IAAI,WAAW,KAAK,SAAS;oBAChD,MAAM,IAAI,oBAAoB,CAAC,8CAA8C,EAAE;wBAC7E,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC/C,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;wBACnC,MAAM,EAAE,KAAK;qBACd,CAAC,CAAC;gBACL,IAAI,KAAK,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ;oBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;qBAC5E,IAAI,YAAY,IAAI,OAAO,iBAAiB,KAAK,QAAQ;oBAC5D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;gBACzD,OAAO,WAAW,CAAC;YACrB,CAAC;YAED,IACE,IAAI,KAAK,eAAe;gBACxB,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;gBAC5B,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EACnC,CAAC;gBACD,MAAM,MAAM,GAAG,cAAc,CAC3B,MAAM,QAAQ,CAAC,MAAM,EAAE;oBACrB,UAAU,EAAE,IAAI,CAAC,GAAG;oBACpB,kBAAkB,EAAE,OAAO;oBAC3B,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;iBAC9C,CAAC,CACH,CAAC;gBACF,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS;oBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACxF,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBACpD,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;oBACrD,IAAI,OAAO,cAAc,KAAK,QAAQ;wBACpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;oBAC7D,MAAM,IAAI,GACR,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;wBACvC,OAAO,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ;wBACpD,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI;wBACpC,CAAC,CAAC,gBAAgB,CAAC;oBACvB,OAAO;wBACL,MAAM,EAAE,aAAa;wBACrB,KAAK,EAAE,IAAI;wBACX,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,UAAU,EAAE,EAAE;wBACd,IAAI,EAAE,aAAa;wBACnB,SAAS,EAAE,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;wBACzD,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,CAAC;wBACV,SAAS,EAAE,CAAC;wBACZ,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;4BAC3C,OAAO,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,QAAQ;4BACvD,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;4BAClE,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC;gBACJ,CAAC;gBACD,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAC,GAAG,CAAC;gBAChB,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC/B,CAAC;YAED,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAC9B,IAAI,SAAS,KAAK,SAAS;oBACzB,MAAM,IAAI,aAAa,CAAC,aAAa,EAAE,6CAA6C,CAAC,CAAC;gBACxF,MAAM,YAAY,GAAiB;oBACjC,SAAS;oBACT,IAAI;oBACJ,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;iBAC9C,CAAC;gBACF,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC;gBACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAChB,MAAM,IAAI,oBAAoB,CAAC,0CAA0C,EAAE;wBACzE,OAAO,EAAE,SAAS;wBAClB,MAAM,EAAE,KAAK;qBACd,CAAC,CAAC;gBACL,MAAM,kBAAkB,GAAG,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC;oBACzD,CAAC,CAAC,GAAG,CAAC,kBAAkB;oBACxB,CAAC,CAAC,SAAS,CAAC;gBACd,IACE,kBAAkB,EAAE,KAAK,KAAK,WAAW;oBACzC,kBAAkB,CAAC,QAAQ,KAAK,gBAAgB;oBAEhD,MAAM,IAAI,8BAA8B,CAAC,WAAW,CAAC,CAAC;gBACxD,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI;oBAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACzD,OAAO,GAAG,CAAC,MAAM,CAAC;YACpB,CAAC;YAED,IAAI,SAAS,KAAK,SAAS;gBACzB,MAAM,IAAI,aAAa,CAAC,aAAa,EAAE,6CAA6C,CAAC,CAAC;YACxF,MAAM,cAAc,GAAmB;gBACrC,SAAS;gBACT,IAAI;gBACJ,IAAI;gBACJ,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;aAC9C,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACrB,MAAM,IAAI,oBAAoB,CAAC,4CAA4C,EAAE;oBAC3E,OAAO,EAAE,SAAS;oBAClB,MAAM,EAAE,KAAK;iBACd,CAAC,CAAC;YACL,MAAM,kBAAkB,GAAG,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBAC9D,CAAC,CAAC,QAAQ,CAAC,kBAAkB;gBAC7B,CAAC,CAAC,SAAS,CAAC;YACd,IACE,kBAAkB,EAAE,KAAK,KAAK,WAAW;gBACzC,kBAAkB,CAAC,QAAQ,KAAK,gBAAgB;gBAEhD,MAAM,IAAI,8BAA8B,CAAC,WAAW,CAAC,CAAC;YACxD,OAAO,QAAQ,CAAC,MAAM,CAAC;QACzB,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IACD,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC;IACvD,CAAC;IACD,KAAK,CAAC,KAAK;QACT,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,MAAM,MAAM,EAAE,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;CACF"}
package/dist/bot/broker/mcp-principal.js CHANGED
@@ -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", "A session id is required");
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))
package/dist/bot/broker/mcp-principal.js.map CHANGED
@@ -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":"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"}