@qduc/term2 0.29.0 → 0.29.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/build-info.json +3 -3
- package/dist/services/retry/committed-tool-continuation.d.ts +24 -0
- package/dist/services/retry/committed-tool-continuation.d.ts.map +1 -1
- package/dist/services/retry/committed-tool-continuation.js +26 -0
- package/dist/services/retry/committed-tool-continuation.js.map +1 -1
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +11 -3
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/session/continuation-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/continuation-recovery-handler.js +6 -0
- package/dist/services/session/continuation-recovery-handler.js.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts +1 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.js +6 -0
- package/dist/services/session/initial-turn-recovery-handler.js.map +1 -1
- package/package.json +1 -1
package/dist/build-info.json
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
import type { ClassifiedFailure, CommittedToolContinuation } from './retry-contracts.js';
|
|
2
2
|
export declare function isSettledCommittedToolContinuation(evidence: CommittedToolContinuation | undefined): boolean;
|
|
3
|
+
/**
|
|
4
|
+
* Provider-state rejection admission.
|
|
5
|
+
*
|
|
6
|
+
* A provider *state* rejection (e.g. 400 `Invalid previous_response_id`,
|
|
7
|
+
* `previous_response_not_found`) means the server refused the chained request
|
|
8
|
+
* before accepting anything, so chain recovery -- break the chain, rebuild the
|
|
9
|
+
* full request from durable history -- cannot replay committed work. It is not
|
|
10
|
+
* a replay.
|
|
11
|
+
*
|
|
12
|
+
* Requirement: every live-turn tool completed locally. How many tools are open
|
|
13
|
+
* or unknown is the only thing that can turn recovery into a replay of a tool
|
|
14
|
+
* that may have run, so it stays guarded (same `allToolsCompleted` /
|
|
15
|
+
* `completedToolCount > 0` rule as `isSettledCommittedToolContinuation`).
|
|
16
|
+
*
|
|
17
|
+
* The request-scoped `completedPairsPresentInHistory` check is deliberately
|
|
18
|
+
* *not* required here. The completed pairs are already durable in the tool
|
|
19
|
+
* ledger, but a provider compaction boundary makes `projectProviderHistory`
|
|
20
|
+
* refuse to insert them behind the boundary -- so the pairs can be durable and
|
|
21
|
+
* still absent from the projected request. Recovery still does not replay them
|
|
22
|
+
* (the `retry_fresh` executor settles the ledger into history before the
|
|
23
|
+
* full-history rebuild), so refusing the turn on that projection detail is a
|
|
24
|
+
* false negative that kills an otherwise healthy mid-turn continuation.
|
|
25
|
+
*/
|
|
26
|
+
export declare function admitsProviderStateRejectionRecovery(evidence: CommittedToolContinuation | undefined): boolean;
|
|
3
27
|
/**
|
|
4
28
|
* Chain recovery rebuilds from durable history instead of replaying committed
|
|
5
29
|
* work. Once every live-turn tool pair is settled, that is true for both a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"committed-tool-continuation.d.ts","sourceRoot":"","sources":["../../../source/services/retry/committed-tool-continuation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEzF,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,yBAAyB,GAAG,SAAS,GAAG,OAAO,CAO3G;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,yBAAyB,GAAG,SAAS,GAC9C,OAAO,CAET"}
|
|
1
|
+
{"version":3,"file":"committed-tool-continuation.d.ts","sourceRoot":"","sources":["../../../source/services/retry/committed-tool-continuation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEzF,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,yBAAyB,GAAG,SAAS,GAAG,OAAO,CAO3G;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,yBAAyB,GAAG,SAAS,GAAG,OAAO,CAE7G;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,yBAAyB,GAAG,SAAS,GAC9C,OAAO,CAET"}
|
|
@@ -4,6 +4,32 @@ export function isSettledCommittedToolContinuation(evidence) {
|
|
|
4
4
|
evidence.allToolsCompleted &&
|
|
5
5
|
evidence.completedPairsPresentInHistory);
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* Provider-state rejection admission.
|
|
9
|
+
*
|
|
10
|
+
* A provider *state* rejection (e.g. 400 `Invalid previous_response_id`,
|
|
11
|
+
* `previous_response_not_found`) means the server refused the chained request
|
|
12
|
+
* before accepting anything, so chain recovery -- break the chain, rebuild the
|
|
13
|
+
* full request from durable history -- cannot replay committed work. It is not
|
|
14
|
+
* a replay.
|
|
15
|
+
*
|
|
16
|
+
* Requirement: every live-turn tool completed locally. How many tools are open
|
|
17
|
+
* or unknown is the only thing that can turn recovery into a replay of a tool
|
|
18
|
+
* that may have run, so it stays guarded (same `allToolsCompleted` /
|
|
19
|
+
* `completedToolCount > 0` rule as `isSettledCommittedToolContinuation`).
|
|
20
|
+
*
|
|
21
|
+
* The request-scoped `completedPairsPresentInHistory` check is deliberately
|
|
22
|
+
* *not* required here. The completed pairs are already durable in the tool
|
|
23
|
+
* ledger, but a provider compaction boundary makes `projectProviderHistory`
|
|
24
|
+
* refuse to insert them behind the boundary -- so the pairs can be durable and
|
|
25
|
+
* still absent from the projected request. Recovery still does not replay them
|
|
26
|
+
* (the `retry_fresh` executor settles the ledger into history before the
|
|
27
|
+
* full-history rebuild), so refusing the turn on that projection detail is a
|
|
28
|
+
* false negative that kills an otherwise healthy mid-turn continuation.
|
|
29
|
+
*/
|
|
30
|
+
export function admitsProviderStateRejectionRecovery(evidence) {
|
|
31
|
+
return evidence !== undefined && evidence.completedToolCount > 0 && evidence.allToolsCompleted;
|
|
32
|
+
}
|
|
7
33
|
/**
|
|
8
34
|
* Chain recovery rebuilds from durable history instead of replaying committed
|
|
9
35
|
* work. Once every live-turn tool pair is settled, that is true for both a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"committed-tool-continuation.js","sourceRoot":"","sources":["../../../source/services/retry/committed-tool-continuation.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kCAAkC,CAAC,QAA+C;IAChG,OAAO,CACL,QAAQ,KAAK,SAAS;QACtB,QAAQ,CAAC,kBAAkB,GAAG,CAAC;QAC/B,QAAQ,CAAC,iBAAiB;QAC1B,QAAQ,CAAC,8BAA8B,CACxC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAA0B,EAC1B,QAA+C;IAE/C,OAAO,OAAO,CAAC,IAAI,KAAK,gBAAgB,IAAI,kCAAkC,CAAC,QAAQ,CAAC,CAAC;AAC3F,CAAC"}
|
|
1
|
+
{"version":3,"file":"committed-tool-continuation.js","sourceRoot":"","sources":["../../../source/services/retry/committed-tool-continuation.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kCAAkC,CAAC,QAA+C;IAChG,OAAO,CACL,QAAQ,KAAK,SAAS;QACtB,QAAQ,CAAC,kBAAkB,GAAG,CAAC;QAC/B,QAAQ,CAAC,iBAAiB;QAC1B,QAAQ,CAAC,8BAA8B,CACxC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,oCAAoC,CAAC,QAA+C;IAClG,OAAO,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,kBAAkB,GAAG,CAAC,IAAI,QAAQ,CAAC,iBAAiB,CAAC;AACjG,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAA0B,EAC1B,QAA+C;IAE/C,OAAO,OAAO,CAAC,IAAI,KAAK,gBAAgB,IAAI,kCAAkC,CAAC,QAAQ,CAAC,CAAC;AAC3F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-classifier.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-classifier.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"retry-classifier.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-classifier.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AA0B/E,qBAAa,sBAAsB;IACrB,OAAO,CAAC,WAAW;IAA2B,OAAO,CAAC,MAAM;IAAxE,YAAoB,WAAW,EAAE,uBAAuB,EAAU,MAAM,GAAE,MAAM,MAAoB,EAEnG;IAED,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,iBAAiB,CA2J1D;CACF"}
|
|
@@ -7,7 +7,7 @@ import { isMissingChainedToolOutputError, isOrphanedChainedToolOutputError } fro
|
|
|
7
7
|
import { isRetryRecoveryBudgetExhaustedError } from './retry-recovery-budget.js';
|
|
8
8
|
import { streamHasCommittedOutput } from '../agent-stream.js';
|
|
9
9
|
import { UnsentWebSocketRequestError } from '../../providers/websocket-request-dispatch.js';
|
|
10
|
-
import { isSettledCommittedToolContinuation } from './committed-tool-continuation.js';
|
|
10
|
+
import { isSettledCommittedToolContinuation, admitsProviderStateRejectionRecovery, } from './committed-tool-continuation.js';
|
|
11
11
|
const TRANSIENT_BASE_DELAY_MS = 500;
|
|
12
12
|
const TRANSIENT_MAX_DELAY_MS = 30_000;
|
|
13
13
|
const MAX_TRANSPORT_DOWNGRADES = 1;
|
|
@@ -58,11 +58,19 @@ export class DefaultRetryClassifier {
|
|
|
58
58
|
// Open or unknown calls, missing pairs, and committed text with no
|
|
59
59
|
// completed tools stay closed.
|
|
60
60
|
if (context.hasCommittedOutput || (stream && streamHasCommittedOutput(stream))) {
|
|
61
|
-
|
|
61
|
+
const providerStateRejected = isProviderStateRejection(error);
|
|
62
|
+
// A provider *state* rejection is not a replay (the server refused the
|
|
63
|
+
// chained request before accepting it), so it is admitted once every
|
|
64
|
+
// live-turn tool has completed locally, even when a compaction boundary
|
|
65
|
+
// keeps the durable pairs out of the projected request -- see
|
|
66
|
+
// admitsProviderStateRejectionRecovery. Every other case still needs the
|
|
67
|
+
// request-scoped settled evidence.
|
|
68
|
+
const recovered = (providerStateRejected && admitsProviderStateRejectionRecovery(context.committedToolContinuation)) ||
|
|
69
|
+
isSettledCommittedToolContinuation(context.committedToolContinuation);
|
|
70
|
+
if (recovered) {
|
|
62
71
|
const connectionInterrupted = error instanceof UnsentWebSocketRequestError ||
|
|
63
72
|
(error instanceof AmbiguousModelOutcomeError && isRecoverableIncompleteStreamClose(error)) ||
|
|
64
73
|
isRecoverableIncompleteStreamClose(error);
|
|
65
|
-
const providerStateRejected = isProviderStateRejection(error);
|
|
66
74
|
if (connectionInterrupted || providerStateRejected) {
|
|
67
75
|
const nextAttempt = retryCounts.transientRetryCount + 1;
|
|
68
76
|
if (nextAttempt > maxTransientRetries) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-classifier.js","sourceRoot":"","sources":["../../../source/services/retry/retry-classifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,EAC/B,kCAAkC,EAClC,yBAAyB,EACzB,yBAAyB,EACzB,sCAAsC,GACvC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,EAAE,0BAA0B,EAAE,gCAAgC,EAAE,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAE,+BAA+B,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACtH,OAAO,EAAE,mCAAmC,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,+CAA+C,CAAC;AAC5F,OAAO,
|
|
1
|
+
{"version":3,"file":"retry-classifier.js","sourceRoot":"","sources":["../../../source/services/retry/retry-classifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAiB,MAAM,6BAA6B,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,+BAA+B,GAAG;IAC5C,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAClG,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,eAAe,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,sBAAsB,CAAC;IACxC,cAAc,EAAE,iCAAiC,CAAC;IAClD,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEN,qBAAa,2BAA2B;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,+BAA+B,EAAI;IAE/D,MAAM,CAAC,GAAG,EAAE;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,KAAK,EAAE,iBAAiB,CAAC;KAC1B,GAAG,cAAc,CAAC,iBAAiB,EAAE,0BAA0B,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"continuation-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAiB,MAAM,6BAA6B,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,+BAA+B,GAAG;IAC5C,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAClG,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,eAAe,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,sBAAsB,CAAC;IACxC,cAAc,EAAE,iCAAiC,CAAC;IAClD,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEN,qBAAa,2BAA2B;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,+BAA+B,EAAI;IAE/D,MAAM,CAAC,GAAG,EAAE;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,KAAK,EAAE,iBAAiB,CAAC;KAC1B,GAAG,cAAc,CAAC,iBAAiB,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAsLtE;CACF"}
|
|
@@ -10,6 +10,12 @@ export class ContinuationRecoveryHandler {
|
|
|
10
10
|
const { error, state } = ctx;
|
|
11
11
|
const maxTransientRetries = this.deps.resolveRetryLimit();
|
|
12
12
|
const retryStream = state.lastStream;
|
|
13
|
+
// Settle the live-turn tool evidence into history before classifying.
|
|
14
|
+
// Completed pairs are durable in the ledger; committing them to the store
|
|
15
|
+
// first lets the admission gate see them where the projection permits, and
|
|
16
|
+
// leaves the full-history rebuild self-contained. Open/unknown calls are
|
|
17
|
+
// unaffected and stay guarded by allToolsCompleted.
|
|
18
|
+
this.deps.toolTracker.reconcileAndUpdateHistory?.();
|
|
13
19
|
const committedToolContinuation = this.deps.toolTracker.inspectCommittedToolContinuation?.();
|
|
14
20
|
const classified = this.deps.retryClassifier.classify({
|
|
15
21
|
error,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation-recovery-handler.js","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"continuation-recovery-handler.js","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ export type InitialTurnRecoveryHandlerDeps = {
|
|
|
37
37
|
retryEventPresenter: RetryEventPresenter;
|
|
38
38
|
sessionId: SessionIdSource;
|
|
39
39
|
provider?: string;
|
|
40
|
-
toolTracker?: Pick<SessionToolTracker, 'inspectCommittedToolContinuation'>;
|
|
40
|
+
toolTracker?: Pick<SessionToolTracker, 'inspectCommittedToolContinuation' | 'reconcileAndUpdateHistory'>;
|
|
41
41
|
};
|
|
42
42
|
export declare class InitialTurnRecoveryHandler {
|
|
43
43
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initial-turn-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAiB,MAAM,6BAA6B,CAAC;AAIxG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,yBAAyB,GACjC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GACpG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAClG,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,cAAc,EAAE,iCAAiC,CAAC;IAClD,eAAe,EAAE,sBAAsB,CAAC;IACxC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,kCAAkC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"initial-turn-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAiB,MAAM,6BAA6B,CAAC;AAIxG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,MAAM,yBAAyB,GACjC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GACpG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAClG,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,cAAc,EAAE,iCAAiC,CAAC;IAClD,eAAe,EAAE,sBAAsB,CAAC;IACxC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,kCAAkC,GAAG,2BAA2B,CAAC,CAAC;CAC1G,CAAC;AAEF,qBAAa,0BAA0B;;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,8BAA8B,EAAI;IAE9D,MAAM,CAAC,GAAG,EAAE;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,OAAO,EAAE,WAAW,CAAC;QACrB,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;KAC5B,GAAG,cAAc,CAAC,iBAAiB,EAAE,yBAAyB,EAAE,IAAI,CAAC,CA2PrE;CAiBF"}
|
|
@@ -14,6 +14,12 @@ export class InitialTurnRecoveryHandler {
|
|
|
14
14
|
if (!this.deps.generationGuard.isCurrent(attempt.token)) {
|
|
15
15
|
return { kind: 'stale' };
|
|
16
16
|
}
|
|
17
|
+
// Settle the live-turn tool evidence into history before classifying -- see
|
|
18
|
+
// the matching comment in continuation-recovery-handler.ts. This matters
|
|
19
|
+
// for the initial path too: a mid-turn tool continuation that fails while
|
|
20
|
+
// the run loop is still draining the initial stream reaches this handler
|
|
21
|
+
// with completed pairs that may not yet be committed.
|
|
22
|
+
this.deps.toolTracker?.reconcileAndUpdateHistory?.();
|
|
17
23
|
const committedToolContinuation = this.deps.toolTracker?.inspectCommittedToolContinuation();
|
|
18
24
|
let classified = this.deps.retryClassifier.classify({
|
|
19
25
|
error,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initial-turn-recovery-handler.js","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"initial-turn-recovery-handler.js","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"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"}
|