@parall/agent-core 1.55.1 → 1.55.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.
- package/dist/dispatch-adapter.d.ts +11 -3
- package/dist/dispatch-adapter.d.ts.map +1 -1
- package/dist/dispatch-inactivity-deadline.d.ts +18 -0
- package/dist/dispatch-inactivity-deadline.d.ts.map +1 -0
- package/dist/dispatch-inactivity-deadline.js +49 -0
- package/dist/gateway-base.d.ts +4 -3
- package/dist/gateway-base.d.ts.map +1 -1
- package/dist/gateway-base.js +18 -16
- package/package.json +2 -2
- package/src/dispatch-adapter.ts +11 -3
- package/src/dispatch-inactivity-deadline.ts +47 -0
- package/src/gateway-base.ts +23 -17
|
@@ -136,6 +136,13 @@ export type DispatchOpts = {
|
|
|
136
136
|
sessionKey: string;
|
|
137
137
|
context: DispatchContext;
|
|
138
138
|
inputLifecycle?: DispatchInputLifecycle;
|
|
139
|
+
/**
|
|
140
|
+
* Refresh the dispatch inactivity deadline when the runtime makes progress
|
|
141
|
+
* that does not become a RuntimeEvent (for example, a streaming delta that
|
|
142
|
+
* the bridge intentionally suppresses). RuntimeEvents refresh it in the
|
|
143
|
+
* gateway automatically.
|
|
144
|
+
*/
|
|
145
|
+
noteActivity?: () => void;
|
|
139
146
|
};
|
|
140
147
|
export type RuntimeInputState = 'started' | 'completed' | 'failed';
|
|
141
148
|
export type RuntimeInputUpdateResult = {
|
|
@@ -212,9 +219,10 @@ export interface DispatchAdapter {
|
|
|
212
219
|
getSessionHistoryPath?(sessionKey: string): string | undefined;
|
|
213
220
|
/**
|
|
214
221
|
* Abort the in-flight dispatch for the given session. Called by the gateway
|
|
215
|
-
* when the dispatch deadline is exceeded. Implementations should
|
|
216
|
-
* `dispatch()` generator (e.g. close a turn sink, end stdin,
|
|
217
|
-
* so the `for await` loop in `runDispatch` exits naturally.
|
|
222
|
+
* when the dispatch inactivity deadline is exceeded. Implementations should
|
|
223
|
+
* unblock the `dispatch()` generator (e.g. close a turn sink, end stdin,
|
|
224
|
+
* fail a stream) so the `for await` loop in `runDispatch` exits naturally.
|
|
225
|
+
* Must be idempotent.
|
|
218
226
|
*/
|
|
219
227
|
abortDispatch?(sessionKey: string): void;
|
|
220
228
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-adapter.d.ts","sourceRoot":"","sources":["../src/dispatch-adapter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dispatch-adapter.d.ts","sourceRoot":"","sources":["../src/dispatch-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export declare class DispatchInactivityDeadline {
|
|
2
|
+
private readonly timeoutMs;
|
|
3
|
+
private readonly onExpire;
|
|
4
|
+
private readonly onDispose;
|
|
5
|
+
private timer;
|
|
6
|
+
private expired;
|
|
7
|
+
private disposed;
|
|
8
|
+
constructor(timeoutMs: number, onExpire: () => void, onDispose: () => void);
|
|
9
|
+
readonly touch: () => void;
|
|
10
|
+
dispose(): void;
|
|
11
|
+
}
|
|
12
|
+
/** Session-keyed registry for activity signals that arrive outside dispatch(). */
|
|
13
|
+
export declare class DispatchInactivityDeadlines {
|
|
14
|
+
private readonly active;
|
|
15
|
+
start(sessionKey: string, timeoutMs: number, onExpire: () => void): DispatchInactivityDeadline;
|
|
16
|
+
touch(sessionKey: string): void;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=dispatch-inactivity-deadline.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dispatch-inactivity-deadline.d.ts","sourceRoot":"","sources":["../src/dispatch-inactivity-deadline.ts"],"names":[],"mappings":"AAAA,qBAAa,0BAA0B;IAMnC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAP5B,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;gBAGN,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,IAAI,EACpB,SAAS,EAAE,MAAM,IAAI;IAGxC,QAAQ,CAAC,KAAK,QAAO,IAAI,CAQvB;IAEF,OAAO,IAAI,IAAI;CAOhB;AAED,kFAAkF;AAClF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiD;IAExE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,0BAA0B;IAS9F,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;CAGhC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
export class DispatchInactivityDeadline {
|
|
2
|
+
timeoutMs;
|
|
3
|
+
onExpire;
|
|
4
|
+
onDispose;
|
|
5
|
+
timer = null;
|
|
6
|
+
expired = false;
|
|
7
|
+
disposed = false;
|
|
8
|
+
constructor(timeoutMs, onExpire, onDispose) {
|
|
9
|
+
this.timeoutMs = timeoutMs;
|
|
10
|
+
this.onExpire = onExpire;
|
|
11
|
+
this.onDispose = onDispose;
|
|
12
|
+
}
|
|
13
|
+
touch = () => {
|
|
14
|
+
if (this.timeoutMs <= 0 || this.expired || this.disposed)
|
|
15
|
+
return;
|
|
16
|
+
if (this.timer)
|
|
17
|
+
clearTimeout(this.timer);
|
|
18
|
+
this.timer = setTimeout(() => {
|
|
19
|
+
this.timer = null;
|
|
20
|
+
this.expired = true;
|
|
21
|
+
this.onExpire();
|
|
22
|
+
}, this.timeoutMs);
|
|
23
|
+
};
|
|
24
|
+
dispose() {
|
|
25
|
+
if (this.disposed)
|
|
26
|
+
return;
|
|
27
|
+
this.disposed = true;
|
|
28
|
+
if (this.timer)
|
|
29
|
+
clearTimeout(this.timer);
|
|
30
|
+
this.timer = null;
|
|
31
|
+
this.onDispose();
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/** Session-keyed registry for activity signals that arrive outside dispatch(). */
|
|
35
|
+
export class DispatchInactivityDeadlines {
|
|
36
|
+
active = new Map();
|
|
37
|
+
start(sessionKey, timeoutMs, onExpire) {
|
|
38
|
+
const deadline = new DispatchInactivityDeadline(timeoutMs, onExpire, () => {
|
|
39
|
+
if (this.active.get(sessionKey) === deadline)
|
|
40
|
+
this.active.delete(sessionKey);
|
|
41
|
+
});
|
|
42
|
+
this.active.set(sessionKey, deadline);
|
|
43
|
+
deadline.touch();
|
|
44
|
+
return deadline;
|
|
45
|
+
}
|
|
46
|
+
touch(sessionKey) {
|
|
47
|
+
this.active.get(sessionKey)?.touch();
|
|
48
|
+
}
|
|
49
|
+
}
|
package/dist/gateway-base.d.ts
CHANGED
|
@@ -162,13 +162,14 @@ export declare class ParallAgentGateway {
|
|
|
162
162
|
* an unrelated stalled fork's lane leased forever).
|
|
163
163
|
*/
|
|
164
164
|
private sessionActiveLanes;
|
|
165
|
+
private dispatchInactivityDeadlines;
|
|
165
166
|
noteSessionLane(sessionKey: string, laneKey: string | null): void;
|
|
166
167
|
/**
|
|
167
168
|
* External runtime-activity signal for adapters whose tool activity does
|
|
168
169
|
* not flow through the RuntimeEvent stream (openclaw hooks call this from
|
|
169
|
-
* the tool-call lifecycle):
|
|
170
|
-
*
|
|
171
|
-
*
|
|
170
|
+
* the tool-call lifecycle): refreshes the dispatch inactivity deadline and
|
|
171
|
+
* renews the session's OWN active ledger lane, when present, so a long tool
|
|
172
|
+
* call cannot time out or get dethroned mid-turn.
|
|
172
173
|
*/
|
|
173
174
|
touchRuntimeActivity(sessionKey: string): void;
|
|
174
175
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway-base.d.ts","sourceRoot":"","sources":["../src/gateway-base.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgC,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,KAAK,EACV,qBAAqB,EAkBtB,MAAM,aAAa,CAAC;AAYrB,OAAO,EAGL,KAAK,eAAe,EAGpB,KAAK,aAAa,EAElB,KAAK,kBAAkB,EAExB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"gateway-base.d.ts","sourceRoot":"","sources":["../src/gateway-base.ts"],"names":[],"mappings":"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"}
|
package/dist/gateway-base.js
CHANGED
|
@@ -8,6 +8,7 @@ import { CAPABILITY_SLACK_SEND, CAPABILITY_WECHAT_SEND, channelCapabilityKeyFor,
|
|
|
8
8
|
import { buildErrorStepContent, } from './dispatch-adapter.js';
|
|
9
9
|
import { clearTypedDedupeForEvent, consumeMessageWorkItem, consumeTypedDispatch, dispatchLaneGroup, resolveDispatchByID, settleDrainedTypedGroup, shiftMainBufferGroup, steerLaneMessage, typedLedgerEventIds, } from './gateway-lane-flow.js';
|
|
10
10
|
import { LaneLedger, bindLaneSession, releaseLocalMessageClaims } from './lane-ledger.js';
|
|
11
|
+
import { DispatchInactivityDeadlines } from './dispatch-inactivity-deadline.js';
|
|
11
12
|
import { routeTrigger } from './routing.js';
|
|
12
13
|
import { redactTurnOutcome } from './redact.js';
|
|
13
14
|
import { StepPersister, isRetryableStepError } from './step-persister.js';
|
|
@@ -537,6 +538,7 @@ export class ParallAgentGateway {
|
|
|
537
538
|
* an unrelated stalled fork's lane leased forever).
|
|
538
539
|
*/
|
|
539
540
|
sessionActiveLanes = new Map();
|
|
541
|
+
dispatchInactivityDeadlines = new DispatchInactivityDeadlines();
|
|
540
542
|
noteSessionLane(sessionKey, laneKey) {
|
|
541
543
|
if (laneKey == null)
|
|
542
544
|
this.sessionActiveLanes.delete(sessionKey);
|
|
@@ -546,11 +548,12 @@ export class ParallAgentGateway {
|
|
|
546
548
|
/**
|
|
547
549
|
* External runtime-activity signal for adapters whose tool activity does
|
|
548
550
|
* not flow through the RuntimeEvent stream (openclaw hooks call this from
|
|
549
|
-
* the tool-call lifecycle):
|
|
550
|
-
*
|
|
551
|
-
*
|
|
551
|
+
* the tool-call lifecycle): refreshes the dispatch inactivity deadline and
|
|
552
|
+
* renews the session's OWN active ledger lane, when present, so a long tool
|
|
553
|
+
* call cannot time out or get dethroned mid-turn.
|
|
552
554
|
*/
|
|
553
555
|
touchRuntimeActivity(sessionKey) {
|
|
556
|
+
this.dispatchInactivityDeadlines.touch(sessionKey);
|
|
554
557
|
if (this.ledgerDisabled)
|
|
555
558
|
return;
|
|
556
559
|
const laneKey = this.sessionActiveLanes.get(sessionKey);
|
|
@@ -1100,17 +1103,15 @@ export class ParallAgentGateway {
|
|
|
1100
1103
|
// — JS event loop is single-threaded, so shutdown() cannot interleave
|
|
1101
1104
|
// here and miss our in-flight count.
|
|
1102
1105
|
this.inFlightDispatches++;
|
|
1103
|
-
const
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
|
|
1111
|
-
|
|
1112
|
-
}, this.DISPATCH_DEADLINE_MS)
|
|
1113
|
-
: null;
|
|
1106
|
+
const dispatchDeadline = this.dispatchInactivityDeadlines.start(sessionKey, this.DISPATCH_DEADLINE_MS, () => {
|
|
1107
|
+
this.opts.log?.warn(`dispatch inactivity deadline exceeded (${this.DISPATCH_DEADLINE_MS}ms) for ${event.messageId} on ${sessionKey}; aborting`);
|
|
1108
|
+
try {
|
|
1109
|
+
this.opts.dispatchAdapter.abortDispatch?.(sessionKey);
|
|
1110
|
+
}
|
|
1111
|
+
catch (err) {
|
|
1112
|
+
this.opts.log?.warn(`abortDispatch threw for ${sessionKey}: ${String(err)}`);
|
|
1113
|
+
}
|
|
1114
|
+
});
|
|
1114
1115
|
let binding = this.sessionBindings.get(sessionKey);
|
|
1115
1116
|
let inputStepsCreated = false;
|
|
1116
1117
|
let turnHandle;
|
|
@@ -1138,7 +1139,9 @@ export class ParallAgentGateway {
|
|
|
1138
1139
|
sessionKey,
|
|
1139
1140
|
context: dispatchContext,
|
|
1140
1141
|
inputLifecycle,
|
|
1142
|
+
noteActivity: dispatchDeadline.touch,
|
|
1141
1143
|
})) {
|
|
1144
|
+
dispatchDeadline.touch();
|
|
1142
1145
|
if (runtimeEvent.type === 'runtime_session') {
|
|
1143
1146
|
const priorAgentSessionId = binding?.agentSessionId;
|
|
1144
1147
|
binding = await this.bindRuntimeSession(sessionKey, runtimeEvent, contextFilePath, laneContextFilePath);
|
|
@@ -1323,8 +1326,7 @@ export class ParallAgentGateway {
|
|
|
1323
1326
|
throw err;
|
|
1324
1327
|
}
|
|
1325
1328
|
finally {
|
|
1326
|
-
|
|
1327
|
-
clearTimeout(deadlineTimer);
|
|
1329
|
+
dispatchDeadline.dispose();
|
|
1328
1330
|
const metricsSnapshot = getDispatchMetrics(sessionKey);
|
|
1329
1331
|
const durationMs = metricsSnapshot ? Date.now() - metricsSnapshot.started_at : 0;
|
|
1330
1332
|
// Effective outcome for telemetry: the bridge's turn_outcome wins;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@parall/agent-core",
|
|
3
|
-
"version": "1.55.
|
|
3
|
+
"version": "1.55.2",
|
|
4
4
|
"description": "Shared agent runtime orchestration helpers for Parall",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@opentelemetry/sdk-metrics": "^1.30.0",
|
|
37
37
|
"@opentelemetry/sdk-trace-node": "^1.30.0",
|
|
38
38
|
"undici": "^7.24.8",
|
|
39
|
-
"@parall/sdk": "1.55.
|
|
39
|
+
"@parall/sdk": "1.55.2"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/node": "^22.0.0",
|
package/src/dispatch-adapter.ts
CHANGED
|
@@ -146,6 +146,13 @@ export type DispatchOpts = {
|
|
|
146
146
|
sessionKey: string;
|
|
147
147
|
context: DispatchContext;
|
|
148
148
|
inputLifecycle?: DispatchInputLifecycle;
|
|
149
|
+
/**
|
|
150
|
+
* Refresh the dispatch inactivity deadline when the runtime makes progress
|
|
151
|
+
* that does not become a RuntimeEvent (for example, a streaming delta that
|
|
152
|
+
* the bridge intentionally suppresses). RuntimeEvents refresh it in the
|
|
153
|
+
* gateway automatically.
|
|
154
|
+
*/
|
|
155
|
+
noteActivity?: () => void;
|
|
149
156
|
};
|
|
150
157
|
|
|
151
158
|
export type RuntimeInputState = 'started' | 'completed' | 'failed';
|
|
@@ -242,9 +249,10 @@ export interface DispatchAdapter {
|
|
|
242
249
|
|
|
243
250
|
/**
|
|
244
251
|
* Abort the in-flight dispatch for the given session. Called by the gateway
|
|
245
|
-
* when the dispatch deadline is exceeded. Implementations should
|
|
246
|
-
* `dispatch()` generator (e.g. close a turn sink, end stdin,
|
|
247
|
-
* so the `for await` loop in `runDispatch` exits naturally.
|
|
252
|
+
* when the dispatch inactivity deadline is exceeded. Implementations should
|
|
253
|
+
* unblock the `dispatch()` generator (e.g. close a turn sink, end stdin,
|
|
254
|
+
* fail a stream) so the `for await` loop in `runDispatch` exits naturally.
|
|
255
|
+
* Must be idempotent.
|
|
248
256
|
*/
|
|
249
257
|
abortDispatch?(sessionKey: string): void;
|
|
250
258
|
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
export class DispatchInactivityDeadline {
|
|
2
|
+
private timer: ReturnType<typeof setTimeout> | null = null;
|
|
3
|
+
private expired = false;
|
|
4
|
+
private disposed = false;
|
|
5
|
+
|
|
6
|
+
constructor(
|
|
7
|
+
private readonly timeoutMs: number,
|
|
8
|
+
private readonly onExpire: () => void,
|
|
9
|
+
private readonly onDispose: () => void,
|
|
10
|
+
) {}
|
|
11
|
+
|
|
12
|
+
readonly touch = (): void => {
|
|
13
|
+
if (this.timeoutMs <= 0 || this.expired || this.disposed) return;
|
|
14
|
+
if (this.timer) clearTimeout(this.timer);
|
|
15
|
+
this.timer = setTimeout(() => {
|
|
16
|
+
this.timer = null;
|
|
17
|
+
this.expired = true;
|
|
18
|
+
this.onExpire();
|
|
19
|
+
}, this.timeoutMs);
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
dispose(): void {
|
|
23
|
+
if (this.disposed) return;
|
|
24
|
+
this.disposed = true;
|
|
25
|
+
if (this.timer) clearTimeout(this.timer);
|
|
26
|
+
this.timer = null;
|
|
27
|
+
this.onDispose();
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Session-keyed registry for activity signals that arrive outside dispatch(). */
|
|
32
|
+
export class DispatchInactivityDeadlines {
|
|
33
|
+
private readonly active = new Map<string, DispatchInactivityDeadline>();
|
|
34
|
+
|
|
35
|
+
start(sessionKey: string, timeoutMs: number, onExpire: () => void): DispatchInactivityDeadline {
|
|
36
|
+
const deadline = new DispatchInactivityDeadline(timeoutMs, onExpire, () => {
|
|
37
|
+
if (this.active.get(sessionKey) === deadline) this.active.delete(sessionKey);
|
|
38
|
+
});
|
|
39
|
+
this.active.set(sessionKey, deadline);
|
|
40
|
+
deadline.touch();
|
|
41
|
+
return deadline;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
touch(sessionKey: string): void {
|
|
45
|
+
this.active.get(sessionKey)?.touch();
|
|
46
|
+
}
|
|
47
|
+
}
|
package/src/gateway-base.ts
CHANGED
|
@@ -58,6 +58,7 @@ import {
|
|
|
58
58
|
} from './gateway-lane-flow.js';
|
|
59
59
|
import type { LaneFlowHost, TypedConsumeHooks } from './gateway-lane-flow.js';
|
|
60
60
|
import { LaneLedger, bindLaneSession, releaseLocalMessageClaims } from './lane-ledger.js';
|
|
61
|
+
import { DispatchInactivityDeadlines } from './dispatch-inactivity-deadline.js';
|
|
61
62
|
import { routeTrigger } from './routing.js';
|
|
62
63
|
import { redactTurnOutcome } from './redact.js';
|
|
63
64
|
import { StepPersister, isRetryableStepError } from './step-persister.js';
|
|
@@ -808,6 +809,7 @@ export class ParallAgentGateway {
|
|
|
808
809
|
* an unrelated stalled fork's lane leased forever).
|
|
809
810
|
*/
|
|
810
811
|
private sessionActiveLanes = new Map<string, string>();
|
|
812
|
+
private dispatchInactivityDeadlines = new DispatchInactivityDeadlines();
|
|
811
813
|
|
|
812
814
|
noteSessionLane(sessionKey: string, laneKey: string | null): void {
|
|
813
815
|
if (laneKey == null) this.sessionActiveLanes.delete(sessionKey);
|
|
@@ -817,11 +819,12 @@ export class ParallAgentGateway {
|
|
|
817
819
|
/**
|
|
818
820
|
* External runtime-activity signal for adapters whose tool activity does
|
|
819
821
|
* not flow through the RuntimeEvent stream (openclaw hooks call this from
|
|
820
|
-
* the tool-call lifecycle):
|
|
821
|
-
*
|
|
822
|
-
*
|
|
822
|
+
* the tool-call lifecycle): refreshes the dispatch inactivity deadline and
|
|
823
|
+
* renews the session's OWN active ledger lane, when present, so a long tool
|
|
824
|
+
* call cannot time out or get dethroned mid-turn.
|
|
823
825
|
*/
|
|
824
826
|
touchRuntimeActivity(sessionKey: string): void {
|
|
827
|
+
this.dispatchInactivityDeadlines.touch(sessionKey);
|
|
825
828
|
if (this.ledgerDisabled) return;
|
|
826
829
|
const laneKey = this.sessionActiveLanes.get(sessionKey);
|
|
827
830
|
if (laneKey) this.laneLedger?.renewByKey(laneKey);
|
|
@@ -1457,19 +1460,20 @@ export class ParallAgentGateway {
|
|
|
1457
1460
|
// here and miss our in-flight count.
|
|
1458
1461
|
this.inFlightDispatches++;
|
|
1459
1462
|
|
|
1460
|
-
const
|
|
1461
|
-
|
|
1462
|
-
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1468
|
-
|
|
1469
|
-
|
|
1470
|
-
|
|
1471
|
-
|
|
1472
|
-
|
|
1463
|
+
const dispatchDeadline = this.dispatchInactivityDeadlines.start(
|
|
1464
|
+
sessionKey,
|
|
1465
|
+
this.DISPATCH_DEADLINE_MS,
|
|
1466
|
+
() => {
|
|
1467
|
+
this.opts.log?.warn(
|
|
1468
|
+
`dispatch inactivity deadline exceeded (${this.DISPATCH_DEADLINE_MS}ms) for ${event.messageId} on ${sessionKey}; aborting`,
|
|
1469
|
+
);
|
|
1470
|
+
try {
|
|
1471
|
+
this.opts.dispatchAdapter.abortDispatch?.(sessionKey);
|
|
1472
|
+
} catch (err) {
|
|
1473
|
+
this.opts.log?.warn(`abortDispatch threw for ${sessionKey}: ${String(err)}`);
|
|
1474
|
+
}
|
|
1475
|
+
},
|
|
1476
|
+
);
|
|
1473
1477
|
|
|
1474
1478
|
let binding = this.sessionBindings.get(sessionKey);
|
|
1475
1479
|
let inputStepsCreated = false;
|
|
@@ -1497,7 +1501,9 @@ export class ParallAgentGateway {
|
|
|
1497
1501
|
sessionKey,
|
|
1498
1502
|
context: dispatchContext,
|
|
1499
1503
|
inputLifecycle,
|
|
1504
|
+
noteActivity: dispatchDeadline.touch,
|
|
1500
1505
|
})) {
|
|
1506
|
+
dispatchDeadline.touch();
|
|
1501
1507
|
if (runtimeEvent.type === 'runtime_session') {
|
|
1502
1508
|
const priorAgentSessionId = binding?.agentSessionId;
|
|
1503
1509
|
binding = await this.bindRuntimeSession(
|
|
@@ -1723,7 +1729,7 @@ export class ParallAgentGateway {
|
|
|
1723
1729
|
}
|
|
1724
1730
|
throw err;
|
|
1725
1731
|
} finally {
|
|
1726
|
-
|
|
1732
|
+
dispatchDeadline.dispose();
|
|
1727
1733
|
const metricsSnapshot = getDispatchMetrics(sessionKey);
|
|
1728
1734
|
const durationMs = metricsSnapshot ? Date.now() - metricsSnapshot.started_at : 0;
|
|
1729
1735
|
|