@qduc/term2 0.32.2 → 0.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build-info.json +2 -2
- package/dist/components/menu/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/menu/ModelSelectionMenu.js +12 -14
- package/dist/components/menu/ModelSelectionMenu.js.map +1 -1
- package/dist/lib/agent-chat-service.d.ts.map +1 -1
- package/dist/lib/agent-chat-service.js +2 -6
- package/dist/lib/agent-chat-service.js.map +1 -1
- package/dist/lib/agent-client.d.ts +2 -1
- package/dist/lib/agent-client.d.ts.map +1 -1
- package/dist/lib/agent-client.js +71 -84
- package/dist/lib/agent-client.js.map +1 -1
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +17 -19
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/prompts/tool-surface-guidance.js +1 -1
- package/dist/prompts/tool-surface-guidance.js.map +1 -1
- package/dist/prompts/tool-surface-guidance.ts +1 -1
- package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-anthropic.provider.js +16 -2
- package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -1
- package/dist/providers/ai-sdk-google.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-google.provider.js +16 -2
- package/dist/providers/ai-sdk-google.provider.js.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.d.ts.map +1 -1
- package/dist/providers/ai-sdk-openrouter.provider.js +16 -1
- package/dist/providers/ai-sdk-openrouter.provider.js.map +1 -1
- package/dist/providers/ai-sdk-provider-settings.d.ts +2 -0
- package/dist/providers/ai-sdk-provider-settings.d.ts.map +1 -1
- package/dist/providers/ai-sdk-provider-settings.js +5 -0
- package/dist/providers/ai-sdk-provider-settings.js.map +1 -1
- package/dist/providers/ai-sdk-streamed-model.d.ts +3 -3
- package/dist/providers/ai-sdk-streamed-model.d.ts.map +1 -1
- package/dist/providers/ai-sdk-streamed-model.js +5 -69
- package/dist/providers/ai-sdk-streamed-model.js.map +1 -1
- package/dist/providers/anthropic-chat-caching.d.ts +5 -0
- package/dist/providers/anthropic-chat-caching.d.ts.map +1 -0
- package/dist/providers/{common/openai-compatible-messages.js → anthropic-chat-caching.js} +19 -1
- package/dist/providers/anthropic-chat-caching.js.map +1 -0
- package/dist/providers/codex.provider.js +2 -0
- package/dist/providers/codex.provider.js.map +1 -1
- package/dist/providers/custom-provider-runtime.d.ts +18 -0
- package/dist/providers/custom-provider-runtime.d.ts.map +1 -0
- package/dist/providers/custom-provider-runtime.js +26 -0
- package/dist/providers/custom-provider-runtime.js.map +1 -0
- package/dist/providers/llama-cpp.provider.d.ts +3 -0
- package/dist/providers/llama-cpp.provider.d.ts.map +1 -1
- package/dist/providers/llama-cpp.provider.js +17 -0
- package/dist/providers/llama-cpp.provider.js.map +1 -1
- package/dist/providers/neuralwatt.provider.d.ts +6 -0
- package/dist/providers/neuralwatt.provider.d.ts.map +1 -0
- package/dist/providers/neuralwatt.provider.js +8 -0
- package/dist/providers/neuralwatt.provider.js.map +1 -0
- package/dist/providers/openai-compatible-lazy.d.ts.map +1 -1
- package/dist/providers/openai-compatible-lazy.js +2 -0
- package/dist/providers/openai-compatible-lazy.js.map +1 -1
- package/dist/providers/openai-compatible-middleware.d.ts +4 -9
- package/dist/providers/openai-compatible-middleware.d.ts.map +1 -1
- package/dist/providers/openai-compatible-middleware.js +25 -48
- package/dist/providers/openai-compatible-middleware.js.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.d.ts +1 -1
- package/dist/providers/openai-compatible-response-normalizer.d.ts.map +1 -1
- package/dist/providers/openai-compatible-response-normalizer.js +6 -6
- package/dist/providers/openai-compatible-response-normalizer.js.map +1 -1
- package/dist/providers/openai-compatible.provider.d.ts +2 -32
- package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
- package/dist/providers/openai-compatible.provider.js +18 -144
- package/dist/providers/openai-compatible.provider.js.map +1 -1
- package/dist/providers/openai.provider.d.ts.map +1 -1
- package/dist/providers/openai.provider.js +1 -0
- package/dist/providers/openai.provider.js.map +1 -1
- package/dist/providers/opencode-middleware.d.ts +9 -0
- package/dist/providers/opencode-middleware.d.ts.map +1 -0
- package/dist/providers/opencode-middleware.js +15 -0
- package/dist/providers/opencode-middleware.js.map +1 -0
- package/dist/providers/opencode-model-provider.d.ts +19 -0
- package/dist/providers/opencode-model-provider.d.ts.map +1 -0
- package/dist/providers/opencode-model-provider.js +128 -0
- package/dist/providers/opencode-model-provider.js.map +1 -0
- package/dist/providers/opencode.provider.d.ts +2 -0
- package/dist/providers/opencode.provider.d.ts.map +1 -1
- package/dist/providers/opencode.provider.js +4 -0
- package/dist/providers/opencode.provider.js.map +1 -1
- package/dist/providers/openrouter-decision-models.d.ts +7 -0
- package/dist/providers/openrouter-decision-models.d.ts.map +1 -0
- package/dist/providers/openrouter-decision-models.js +31 -0
- package/dist/providers/openrouter-decision-models.js.map +1 -0
- package/dist/providers/openrouter.provider.js +2 -1
- package/dist/providers/openrouter.provider.js.map +1 -1
- package/dist/providers/orcarouter-models.d.ts +12 -0
- package/dist/providers/orcarouter-models.d.ts.map +1 -0
- package/dist/providers/orcarouter-models.js +34 -0
- package/dist/providers/orcarouter-models.js.map +1 -0
- package/dist/providers/registry.d.ts +7 -0
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts +20 -1
- package/dist/services/agent-runtime/application-run-loop.d.ts.map +1 -1
- package/dist/services/agent-runtime/application-run-loop.js +871 -759
- package/dist/services/agent-runtime/application-run-loop.js.map +1 -1
- package/dist/services/agent-runtime/tool-call-execution.d.ts +1 -1
- package/dist/services/agent-runtime/tool-call-execution.d.ts.map +1 -1
- package/dist/services/agent-runtime/tool-call-execution.js +6 -3
- package/dist/services/agent-runtime/tool-call-execution.js.map +1 -1
- package/dist/services/approval/approval-flow-coordinator.d.ts +4 -2
- package/dist/services/approval/approval-flow-coordinator.d.ts.map +1 -1
- package/dist/services/approval/approval-flow-coordinator.js +2 -1
- package/dist/services/approval/approval-flow-coordinator.js.map +1 -1
- package/dist/services/approval/approval-state.d.ts +0 -13
- package/dist/services/approval/approval-state.d.ts.map +1 -1
- package/dist/services/approval/approval-state.js +0 -5
- package/dist/services/approval/approval-state.js.map +1 -1
- package/dist/services/approval/background-subagent-approval-controller.d.ts.map +1 -1
- package/dist/services/approval/background-subagent-approval-controller.js +0 -2
- package/dist/services/approval/background-subagent-approval-controller.js.map +1 -1
- package/dist/services/approval/nested-approval-owner.d.ts.map +1 -1
- package/dist/services/approval/nested-approval-owner.js +5 -1
- package/dist/services/approval/nested-approval-owner.js.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.d.ts +2 -2
- package/dist/services/approval/shell-auto-approval-resolver.d.ts.map +1 -1
- package/dist/services/approval/shell-auto-approval-resolver.js +2 -2
- package/dist/services/approval/shell-auto-approval-resolver.js.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts +2 -2
- package/dist/services/approval/tool-approval-batch-coordinator.d.ts.map +1 -1
- package/dist/services/approval/tool-approval-batch-coordinator.js +4 -4
- package/dist/services/approval/tool-approval-batch-coordinator.js.map +1 -1
- package/dist/services/conversation/conversation-adapter.d.ts +17 -47
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +114 -88
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +48 -121
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-record-stream.d.ts +21 -0
- package/dist/services/conversation/conversation-record-stream.d.ts.map +1 -0
- package/dist/services/conversation/conversation-record-stream.js +186 -0
- package/dist/services/conversation/conversation-record-stream.js.map +1 -0
- package/dist/services/conversation/conversation-record.d.ts +160 -0
- package/dist/services/conversation/conversation-record.d.ts.map +1 -0
- package/dist/services/conversation/conversation-record.js +371 -0
- package/dist/services/conversation/conversation-record.js.map +1 -0
- package/dist/services/conversation/conversation-result-builder.d.ts +0 -4
- package/dist/services/conversation/conversation-result-builder.d.ts.map +1 -1
- package/dist/services/conversation/conversation-result-builder.js +0 -10
- package/dist/services/conversation/conversation-result-builder.js.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +2 -1
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +3 -0
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/conversation-agent-client.d.ts +17 -7
- package/dist/services/conversation-agent-client.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.d.ts +1 -7
- package/dist/services/logging/conversation-logger.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.js +0 -18
- package/dist/services/logging/conversation-logger.js.map +1 -1
- package/dist/services/model-service.d.ts +2 -6
- package/dist/services/model-service.d.ts.map +1 -1
- package/dist/services/model-service.js +8 -21
- package/dist/services/model-service.js.map +1 -1
- package/dist/services/models/decision-model-listing.d.ts +2 -12
- package/dist/services/models/decision-model-listing.d.ts.map +1 -1
- package/dist/services/models/decision-model-listing.js +2 -29
- package/dist/services/models/decision-model-listing.js.map +1 -1
- package/dist/services/provider-continuity.d.ts +26 -0
- package/dist/services/provider-continuity.d.ts.map +1 -1
- package/dist/services/provider-continuity.js +47 -0
- package/dist/services/provider-continuity.js.map +1 -1
- package/dist/services/retry/recovery-executor.d.ts +3 -4
- package/dist/services/retry/recovery-executor.d.ts.map +1 -1
- package/dist/services/retry/recovery-executor.js +13 -75
- package/dist/services/retry/recovery-executor.js.map +1 -1
- package/dist/services/retry/retry-contracts.d.ts +2 -10
- package/dist/services/retry/retry-contracts.d.ts.map +1 -1
- package/dist/services/session/continuation-plan-applier.d.ts +5 -9
- package/dist/services/session/continuation-plan-applier.d.ts.map +1 -1
- package/dist/services/session/continuation-plan-applier.js +9 -43
- package/dist/services/session/continuation-plan-applier.js.map +1 -1
- package/dist/services/session/continuation-recovery-handler.d.ts +4 -6
- package/dist/services/session/continuation-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/continuation-recovery-handler.js +3 -15
- package/dist/services/session/continuation-recovery-handler.js.map +1 -1
- package/dist/services/session/initial-input-preparer.d.ts +2 -2
- package/dist/services/session/initial-input-preparer.d.ts.map +1 -1
- package/dist/services/session/initial-input-preparer.js +3 -3
- package/dist/services/session/initial-input-preparer.js.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.d.ts +2 -4
- package/dist/services/session/initial-turn-recovery-handler.d.ts.map +1 -1
- package/dist/services/session/initial-turn-recovery-handler.js +4 -5
- package/dist/services/session/initial-turn-recovery-handler.js.map +1 -1
- package/dist/services/session/live-run.d.ts +9 -3
- package/dist/services/session/live-run.d.ts.map +1 -1
- package/dist/services/session/live-run.js +19 -4
- package/dist/services/session/live-run.js.map +1 -1
- package/dist/services/session/session-composition.d.ts +8 -12
- package/dist/services/session/session-composition.d.ts.map +1 -1
- package/dist/services/session/session-composition.js +41 -87
- package/dist/services/session/session-composition.js.map +1 -1
- package/dist/services/session/session-input-planner.d.ts +2 -2
- package/dist/services/session/session-input-planner.d.ts.map +1 -1
- package/dist/services/session/session-input-planner.js +6 -13
- package/dist/services/session/session-input-planner.js.map +1 -1
- package/dist/services/session/session-lifecycle.d.ts +73 -23
- package/dist/services/session/session-lifecycle.d.ts.map +1 -1
- package/dist/services/session/session-lifecycle.js +127 -45
- package/dist/services/session/session-lifecycle.js.map +1 -1
- package/dist/services/session/session-stream-processor.d.ts +4 -30
- package/dist/services/session/session-stream-processor.d.ts.map +1 -1
- package/dist/services/session/session-stream-processor.js +11 -300
- package/dist/services/session/session-stream-processor.js.map +1 -1
- package/dist/services/session/session-tool-tracker.d.ts +9 -144
- package/dist/services/session/session-tool-tracker.d.ts.map +1 -1
- package/dist/services/session/session-tool-tracker.js +17 -251
- package/dist/services/session/session-tool-tracker.js.map +1 -1
- package/dist/services/session/{turn-workflow.d.ts → session-turn-adapter.d.ts} +10 -43
- package/dist/services/session/session-turn-adapter.d.ts.map +1 -0
- package/dist/services/session/session-turn-adapter.js +734 -0
- package/dist/services/session/session-turn-adapter.js.map +1 -0
- package/dist/services/session/turn-attempt-factory.d.ts +2 -11
- package/dist/services/session/turn-attempt-factory.d.ts.map +1 -1
- package/dist/services/session/turn-attempt-factory.js +4 -12
- package/dist/services/session/turn-attempt-factory.js.map +1 -1
- package/dist/services/session/turn-attempt.d.ts +0 -3
- package/dist/services/session/turn-attempt.d.ts.map +1 -1
- package/dist/services/session/turn-attempt.js +0 -5
- package/dist/services/session/turn-attempt.js.map +1 -1
- package/dist/services/session/turn-coordinator.d.ts +3 -3
- package/dist/services/session/turn-coordinator.d.ts.map +1 -1
- package/dist/services/session/turn-coordinator.js +31 -26
- package/dist/services/session/turn-coordinator.js.map +1 -1
- package/dist/services/session/turn-projection-state.d.ts +45 -0
- package/dist/services/session/turn-projection-state.d.ts.map +1 -0
- package/dist/services/session/turn-projection-state.js +61 -0
- package/dist/services/session/turn-projection-state.js.map +1 -0
- package/dist/services/subagents/tool-policy.d.ts +5 -5
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/tools/system/run-code/run-code-runtime.d.ts.map +1 -1
- package/dist/tools/system/run-code/run-code-runtime.js +90 -19
- package/dist/tools/system/run-code/run-code-runtime.js.map +1 -1
- package/dist/tools/system/shell.d.ts +2 -2
- package/dist/tools/system/shell.d.ts.map +1 -1
- package/dist/tools/system/shell.js +1 -0
- package/dist/tools/system/shell.js.map +1 -1
- package/dist/tools/tool-names.d.ts +1 -1
- package/dist/tools/tool-names.d.ts.map +1 -1
- package/dist/utils/ai/token-usage.js +9 -8
- package/dist/utils/ai/token-usage.js.map +1 -1
- package/package.json +1 -1
- package/dist/providers/anthropic-middleware.d.ts +0 -25
- package/dist/providers/anthropic-middleware.d.ts.map +0 -1
- package/dist/providers/anthropic-middleware.js +0 -32
- package/dist/providers/anthropic-middleware.js.map +0 -1
- package/dist/providers/common/openai-compatible-messages.d.ts +0 -2
- package/dist/providers/common/openai-compatible-messages.d.ts.map +0 -1
- package/dist/providers/common/openai-compatible-messages.js.map +0 -1
- package/dist/services/session/continuation-call-id-resolver.d.ts +0 -29
- package/dist/services/session/continuation-call-id-resolver.d.ts.map +0 -1
- package/dist/services/session/continuation-call-id-resolver.js +0 -69
- package/dist/services/session/continuation-call-id-resolver.js.map +0 -1
- package/dist/services/session/continuation-state.d.ts +0 -69
- package/dist/services/session/continuation-state.d.ts.map +0 -1
- package/dist/services/session/continuation-state.js +0 -78
- package/dist/services/session/continuation-state.js.map +0 -1
- package/dist/services/session/session-manager.d.ts +0 -87
- package/dist/services/session/session-manager.d.ts.map +0 -1
- package/dist/services/session/session-manager.js +0 -146
- package/dist/services/session/session-manager.js.map +0 -1
- package/dist/services/session/turn-workflow.d.ts.map +0 -1
- package/dist/services/session/turn-workflow.js +0 -1055
- package/dist/services/session/turn-workflow.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { OpenAIRootCheckpointLifecycleObserver } from './openai-root-checkpoint-lifecycle-observer.js';
|
|
1
2
|
export type ProviderCheckpointIdentity = {
|
|
2
3
|
provider: string;
|
|
3
4
|
endpoint: string;
|
|
@@ -41,6 +42,14 @@ export type ProviderCheckpoint = ProviderCheckpointBinding & {
|
|
|
41
42
|
successorProof?: ProviderCheckpointSuccessorProof;
|
|
42
43
|
retirement?: ProviderCheckpointRetirement;
|
|
43
44
|
};
|
|
45
|
+
/** An authoritative Record fact, incorporated before another request is prepared. */
|
|
46
|
+
export type AcceptedProviderSegment = {
|
|
47
|
+
kind: 'committed' | 'partial';
|
|
48
|
+
lastResponseId: string | null;
|
|
49
|
+
historyCommitted: boolean;
|
|
50
|
+
snapshot: ProviderCheckpointSuccessorProof;
|
|
51
|
+
unsettledToolCallIds: readonly string[];
|
|
52
|
+
};
|
|
44
53
|
/**
|
|
45
54
|
* Owns provider-side response chaining state: previousResponseId and
|
|
46
55
|
* whether chaining has been broken (e.g. by transport downgrade).
|
|
@@ -70,6 +79,18 @@ export declare class ProviderContinuity {
|
|
|
70
79
|
* list when the latest terminal response left no open function calls.
|
|
71
80
|
*/
|
|
72
81
|
replaceOutstandingToolCallIds(callIds: readonly string[]): void;
|
|
82
|
+
/** A new user request cannot leave the preceding response's tool debt unpaid. */
|
|
83
|
+
prepareNewTurn(historyLength: number): boolean;
|
|
84
|
+
/** Keep response identity and lineage encoding inside their protocol owner. */
|
|
85
|
+
prepareRequest<T extends object>(options: T, view: {
|
|
86
|
+
kind: 'initial';
|
|
87
|
+
inputMode: 'delta' | 'full_history';
|
|
88
|
+
disableChaining?: boolean;
|
|
89
|
+
} | {
|
|
90
|
+
kind: 'continuation';
|
|
91
|
+
}): T & {
|
|
92
|
+
previousResponseId: string | null | undefined;
|
|
93
|
+
};
|
|
73
94
|
/**
|
|
74
95
|
* Records a provider response observed before its terminal history is
|
|
75
96
|
* committed. This deliberately does not update previousResponseId: existing
|
|
@@ -93,6 +114,11 @@ export declare class ProviderContinuity {
|
|
|
93
114
|
* for a future request.
|
|
94
115
|
*/
|
|
95
116
|
publishTerminalResponse(responseId: string | null, historyCommitted: boolean, postCommitSnapshot?: ProviderCheckpointSuccessorProof): boolean;
|
|
117
|
+
/**
|
|
118
|
+
* Synchronous, in-memory protocol update. Record acceptance has already
|
|
119
|
+
* happened; diagnostics cannot undo it or turn it into a replayable failure.
|
|
120
|
+
*/
|
|
121
|
+
acceptSegment(segment: AcceptedProviderSegment, observer?: OpenAIRootCheckpointLifecycleObserver): void;
|
|
96
122
|
/**
|
|
97
123
|
* Pure, fail-closed characterization for a future OpenAI-private selector.
|
|
98
124
|
* A successor must preserve the committed transcript exactly and add to it;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-continuity.d.ts","sourceRoot":"","sources":["../../source/services/provider-continuity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider-continuity.d.ts","sourceRoot":"","sources":["../../source/services/provider-continuity.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,31 @@ export class ProviderContinuity {
|
|
|
59
59
|
}
|
|
60
60
|
this.#outstandingToolCallIds = unique;
|
|
61
61
|
}
|
|
62
|
+
/** A new user request cannot leave the preceding response's tool debt unpaid. */
|
|
63
|
+
prepareNewTurn(historyLength) {
|
|
64
|
+
const hadDebt = this.hasOutstandingToolDebt();
|
|
65
|
+
if (hadDebt && this.#previousResponseId)
|
|
66
|
+
this.clear();
|
|
67
|
+
return !hadDebt && this.isChainingAvailable(historyLength);
|
|
68
|
+
}
|
|
69
|
+
/** Keep response identity and lineage encoding inside their protocol owner. */
|
|
70
|
+
prepareRequest(options, view) {
|
|
71
|
+
const request = {
|
|
72
|
+
...options,
|
|
73
|
+
previousResponseId: view.kind === 'continuation'
|
|
74
|
+
? this.#previousResponseId
|
|
75
|
+
: view.disableChaining
|
|
76
|
+
? undefined
|
|
77
|
+
: view.inputMode === 'delta'
|
|
78
|
+
? this.#previousResponseId
|
|
79
|
+
: null,
|
|
80
|
+
};
|
|
81
|
+
Object.defineProperty(request, 'providerContinuityLineage', {
|
|
82
|
+
value: this.#lineage,
|
|
83
|
+
enumerable: this.#lineage !== 0,
|
|
84
|
+
});
|
|
85
|
+
return request;
|
|
86
|
+
}
|
|
62
87
|
/**
|
|
63
88
|
* Records a provider response observed before its terminal history is
|
|
64
89
|
* committed. This deliberately does not update previousResponseId: existing
|
|
@@ -115,6 +140,28 @@ export class ProviderContinuity {
|
|
|
115
140
|
}
|
|
116
141
|
return promoted;
|
|
117
142
|
}
|
|
143
|
+
/**
|
|
144
|
+
* Synchronous, in-memory protocol update. Record acceptance has already
|
|
145
|
+
* happened; diagnostics cannot undo it or turn it into a replayable failure.
|
|
146
|
+
*/
|
|
147
|
+
acceptSegment(segment, observer) {
|
|
148
|
+
const hadCandidate = this.#checkpoint?.state === 'candidate';
|
|
149
|
+
let promoted = false;
|
|
150
|
+
if (segment.kind === 'committed') {
|
|
151
|
+
promoted = this.publishTerminalResponse(segment.lastResponseId, segment.historyCommitted, segment.snapshot);
|
|
152
|
+
}
|
|
153
|
+
else
|
|
154
|
+
this.update(segment.lastResponseId);
|
|
155
|
+
this.replaceOutstandingToolCallIds(segment.unsettledToolCallIds);
|
|
156
|
+
if (segment.kind === 'committed' && hadCandidate) {
|
|
157
|
+
try {
|
|
158
|
+
observer?.publication(!segment.historyCommitted ? 'history_not_committed' : promoted ? 'promoted' : 'candidate_not_promoted');
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
// Observability must not reject an accepted external effect.
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
118
165
|
/**
|
|
119
166
|
* Pure, fail-closed characterization for a future OpenAI-private selector.
|
|
120
167
|
* A successor must preserve the committed transcript exactly and add to it;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-continuity.js","sourceRoot":"","sources":["../../source/services/provider-continuity.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-continuity.js","sourceRoot":"","sources":["../../source/services/provider-continuity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import type { RecoveryResult, RecoveryExecutor, RecoveryExecutorInput } from './retry-contracts.js';
|
|
2
|
-
import type {
|
|
2
|
+
import type { ConversationRecord } from '../conversation/conversation-record.js';
|
|
3
3
|
import type { ProviderContinuity } from '../provider-continuity.js';
|
|
4
|
-
import type { SessionToolTracker } from '../session/session-tool-tracker.js';
|
|
5
4
|
export type RecoveryExecutorDeps = {
|
|
6
|
-
|
|
7
|
-
conversationStore: ConversationStore;
|
|
5
|
+
record: ConversationRecord;
|
|
8
6
|
providerContinuity: ProviderContinuity;
|
|
9
7
|
};
|
|
8
|
+
/** Applies policy-selected retry settings; Record owns acceptance and reconstruction. */
|
|
10
9
|
export declare class DefaultRecoveryExecutor implements RecoveryExecutor {
|
|
11
10
|
private deps;
|
|
12
11
|
constructor(deps: RecoveryExecutorDeps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-executor.d.ts","sourceRoot":"","sources":["../../../source/services/retry/recovery-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"recovery-executor.d.ts","sourceRoot":"","sources":["../../../source/services/retry/recovery-executor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAsB,cAAc,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACxH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,yFAAyF;AACzF,qBAAa,uBAAwB,YAAW,gBAAgB;IAClD,OAAO,CAAC,IAAI;IAAxB,YAAoB,IAAI,EAAE,oBAAoB,EAAI;IAElD,KAAK,CAAC,KAAK,EAAE,qBAAqB,GAAG,cAAc,CA0ClD;CACF"}
|
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { projectProviderHistory } from '../conversation/conversation-state-projector.js';
|
|
3
|
-
const journalSnapshotToLedger = (snapshot) => {
|
|
4
|
-
if (!snapshot || snapshot.length === 0)
|
|
5
|
-
return [];
|
|
6
|
-
return buildToolLedgerFromJournalEvents(snapshot, new Date().toISOString());
|
|
7
|
-
};
|
|
1
|
+
/** Applies policy-selected retry settings; Record owns acceptance and reconstruction. */
|
|
8
2
|
export class DefaultRecoveryExecutor {
|
|
9
3
|
deps;
|
|
10
4
|
constructor(deps) {
|
|
@@ -12,26 +6,10 @@ export class DefaultRecoveryExecutor {
|
|
|
12
6
|
}
|
|
13
7
|
apply(input) {
|
|
14
8
|
const { plan, state, retryCounts, maxModelRetries } = input;
|
|
9
|
+
this.deps.providerContinuity.clear();
|
|
10
|
+
const recoverySummary = this.deps.record.recover(plan, state);
|
|
15
11
|
switch (plan.kind) {
|
|
16
|
-
case 'resume_stream': {
|
|
17
|
-
const instruction = {
|
|
18
|
-
skipUserMessage: true,
|
|
19
|
-
retryCounts,
|
|
20
|
-
maxModelRetries,
|
|
21
|
-
resumeState: plan.state,
|
|
22
|
-
resumePreviousResponseId: plan.previousResponseId,
|
|
23
|
-
};
|
|
24
|
-
return { kind: 'run', instruction, events: [] };
|
|
25
|
-
}
|
|
26
12
|
case 'replay_turn': {
|
|
27
|
-
this.deps.providerContinuity.clear();
|
|
28
|
-
this.deps.toolTracker.import(journalSnapshotToLedger(state.journalSnapshot));
|
|
29
|
-
if (plan.rollbackUserMessage) {
|
|
30
|
-
this.deps.conversationStore.removeLastUserMessage();
|
|
31
|
-
}
|
|
32
|
-
if (plan.errorContext) {
|
|
33
|
-
this.deps.conversationStore.addErrorContext(plan.errorContext);
|
|
34
|
-
}
|
|
35
13
|
const instruction = {
|
|
36
14
|
skipUserMessage: !plan.rollbackUserMessage,
|
|
37
15
|
retryCounts,
|
|
@@ -40,25 +18,6 @@ export class DefaultRecoveryExecutor {
|
|
|
40
18
|
return { kind: 'run', instruction, events: [] };
|
|
41
19
|
}
|
|
42
20
|
case 'retry_fresh': {
|
|
43
|
-
if (state.stream) {
|
|
44
|
-
this.deps.providerContinuity.clear();
|
|
45
|
-
// Settle open calls before restoring the snapshot: never-dispatched
|
|
46
|
-
// calls become aborted; dispatched-but-unobserved become unknown so
|
|
47
|
-
// the model is told to verify before retrying non-idempotent work.
|
|
48
|
-
this.deps.toolTracker.settleOpenCallsOnStreamFailure('Stream failed');
|
|
49
|
-
this.deps.toolTracker.restoreCompletedEntries(journalSnapshotToLedger(state.journalSnapshot));
|
|
50
|
-
const projected = projectProviderHistory({
|
|
51
|
-
history: this.deps.conversationStore.getHistory(),
|
|
52
|
-
toolLedger: this.deps.toolTracker.export(),
|
|
53
|
-
});
|
|
54
|
-
if (projected.warnings.length > 0) {
|
|
55
|
-
this.deps.conversationStore.replaceHistory(projected.history);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
this.deps.providerContinuity.clear();
|
|
60
|
-
this.deps.toolTracker.restoreCompletedEntries(journalSnapshotToLedger(state.journalSnapshot));
|
|
61
|
-
}
|
|
62
21
|
const instruction = {
|
|
63
22
|
skipUserMessage: true,
|
|
64
23
|
retryCounts,
|
|
@@ -74,37 +33,16 @@ export class DefaultRecoveryExecutor {
|
|
|
74
33
|
};
|
|
75
34
|
}
|
|
76
35
|
case 'terminate': {
|
|
77
|
-
const events =
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const projected = projectProviderHistory({
|
|
88
|
-
history: this.deps.conversationStore.getHistory(),
|
|
89
|
-
toolLedger: this.deps.toolTracker.export(),
|
|
90
|
-
});
|
|
91
|
-
if (projected.warnings.length > 0) {
|
|
92
|
-
this.deps.conversationStore.replaceHistory(projected.history);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
// Chain settlement: a terminated stream must not leave previousResponseId
|
|
96
|
-
// pointing at a response that still requires tool outputs. The next user
|
|
97
|
-
// turn ("continue") would otherwise send a text-only delta and get a 400.
|
|
98
|
-
this.deps.providerContinuity.clear();
|
|
99
|
-
const recoverySummary = this.deps.toolTracker.getRecoverySummary();
|
|
100
|
-
if (recoverySummary) {
|
|
101
|
-
events.push({
|
|
102
|
-
type: 'tool_recovery',
|
|
103
|
-
recoveredCallIds: recoverySummary.recoveredCallIds,
|
|
104
|
-
droppedCallIds: recoverySummary.droppedCallIds,
|
|
105
|
-
message: recoverySummary.message,
|
|
106
|
-
});
|
|
107
|
-
}
|
|
36
|
+
const events = recoverySummary
|
|
37
|
+
? [
|
|
38
|
+
{
|
|
39
|
+
type: 'tool_recovery',
|
|
40
|
+
recoveredCallIds: recoverySummary.recoveredCallIds,
|
|
41
|
+
droppedCallIds: recoverySummary.droppedCallIds,
|
|
42
|
+
message: recoverySummary.message,
|
|
43
|
+
},
|
|
44
|
+
]
|
|
45
|
+
: [];
|
|
108
46
|
return { kind: 'terminated', events: [...plan.events, ...events] };
|
|
109
47
|
}
|
|
110
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-executor.js","sourceRoot":"","sources":["../../../source/services/retry/recovery-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"recovery-executor.js","sourceRoot":"","sources":["../../../source/services/retry/recovery-executor.ts"],"names":[],"mappings":"AAUA,yFAAyF;AACzF,MAAM,OAAO,uBAAuB;IACd,IAAI;IAAxB,YAAoB,IAA0B;oBAA1B,IAAI;IAAyB,CAAC;IAElD,KAAK,CAAC,KAA4B;QAChC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9D,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,aAAa,EAAE,CAAC;gBACnB,MAAM,WAAW,GAAuB;oBACtC,eAAe,EAAE,CAAC,IAAI,CAAC,mBAAmB;oBAC1C,WAAW;oBACX,eAAe;iBAChB,CAAC;gBACF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YAClD,CAAC;YACD,KAAK,aAAa,EAAE,CAAC;gBACnB,MAAM,WAAW,GAAuB;oBACtC,eAAe,EAAE,IAAI;oBACrB,WAAW;oBACX,eAAe;oBACf,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC/E,CAAC;gBACF,OAAO;oBACL,IAAI,EAAE,KAAK;oBACX,WAAW;oBACX,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxE,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC9E,MAAM,EAAE,EAAE;iBACX,CAAC;YACJ,CAAC;YACD,KAAK,WAAW,EAAE,CAAC;gBACjB,MAAM,MAAM,GAAwB,eAAe;oBACjD,CAAC,CAAC;wBACE;4BACE,IAAI,EAAE,eAAe;4BACrB,gBAAgB,EAAE,eAAe,CAAC,gBAAgB;4BAClD,cAAc,EAAE,eAAe,CAAC,cAAc;4BAC9C,OAAO,EAAE,eAAe,CAAC,OAAO;yBACjC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;YACrE,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type { ContinuationHandle } from '../../contracts/continuation-handle.js';
|
|
2
1
|
import type { AgentStream } from '../agent-stream.js';
|
|
3
2
|
import type { ConversationEvent } from '../conversation/conversation-events.js';
|
|
4
|
-
import type { AssistantJournalItemLogEvent } from '../logging/conversation-log-events.js';
|
|
5
3
|
export type ClassifiedFailure = {
|
|
6
4
|
kind: 'transient';
|
|
7
5
|
attempt: number;
|
|
@@ -36,10 +34,6 @@ export type ClassifiedFailure = {
|
|
|
36
34
|
kind: 'unrecoverable';
|
|
37
35
|
};
|
|
38
36
|
export type RecoveryPlan = {
|
|
39
|
-
kind: 'resume_stream';
|
|
40
|
-
state: ContinuationHandle;
|
|
41
|
-
previousResponseId: string | null;
|
|
42
|
-
} | {
|
|
43
37
|
kind: 'replay_turn';
|
|
44
38
|
inputMode: 'full_history';
|
|
45
39
|
rollbackUserMessage: boolean;
|
|
@@ -89,8 +83,8 @@ export type RecoveryContext = {
|
|
|
89
83
|
freshStartRetriesAllowed: boolean;
|
|
90
84
|
};
|
|
91
85
|
export type RecoveryState = {
|
|
92
|
-
/**
|
|
93
|
-
|
|
86
|
+
/** Which Record-owned preparation boundary to recover from. */
|
|
87
|
+
baseline: 'initial' | 'decision';
|
|
94
88
|
addedUserMessage: boolean;
|
|
95
89
|
stream: AgentStream | null;
|
|
96
90
|
};
|
|
@@ -98,8 +92,6 @@ export type NextRunInstruction = {
|
|
|
98
92
|
skipUserMessage: boolean;
|
|
99
93
|
retryCounts: RetryCounts;
|
|
100
94
|
maxModelRetries?: number;
|
|
101
|
-
resumeState?: ContinuationHandle;
|
|
102
|
-
resumePreviousResponseId?: string | null;
|
|
103
95
|
disableChainingForAttempt?: boolean;
|
|
104
96
|
};
|
|
105
97
|
export type RecoveryInstructions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-contracts.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-contracts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"retry-contracts.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-contracts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAIhF,MAAM,MAAM,iBAAiB,GACzB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AACzD;;;;;;;;;;;GAWG;GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,yBAAyB,GAAG,wBAAwB,CAAC;CAC7D,GACD;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,qBAAqB,CAAA;CAAE,GAC/B;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,wCAAwC,EAAE,iBAAiB,CAAC;CACjF,GACD;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC;AAI9B,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACvG;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,cAAc,CAAC;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,uFAAuF;IACvF,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,GACD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAAC;AAIvD,MAAM,MAAM,WAAW,GAAG;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,wBAAwB,EAAE,MAAM,CAAC;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC;AAIF,MAAM,MAAM,yBAAyB,GAAG;IACtC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,8BAA8B,EAAE,OAAO,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;IACtD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAIF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAAC;AAIF,MAAM,MAAM,aAAa,GAAG;IAC1B,+DAA+D;IAC/D,QAAQ,EAAE,SAAS,GAAG,UAAU,CAAC;IACjC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;CAC5B,CAAC;AAIF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAIF,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB,CAAC;IACC,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,kBAAkB,CAAC;IAChC,MAAM,EAAE,iBAAiB,EAAE,CAAC;CAC7B,GAAG,oBAAoB,CAAC,GACzB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,aAAa,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAIF,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,iBAAiB,CAAC;CAC7D;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,YAAY,CAAC;CAC9C;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,KAAK,EAAE,qBAAqB,GAAG,cAAc,CAAC;CACrD"}
|
|
@@ -1,25 +1,21 @@
|
|
|
1
1
|
import type { ConversationEvent } from '../conversation/conversation-events.js';
|
|
2
2
|
import type { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
|
|
3
3
|
import type { SessionToolTracker } from './session-tool-tracker.js';
|
|
4
|
-
import type {
|
|
5
|
-
import type { ContinuationInit, ContinuationState, PreparedContinuation } from './continuation-state.js';
|
|
4
|
+
import type { ContinuationInit, TurnProjectionState, PreparedContinuation } from './turn-projection-state.js';
|
|
6
5
|
import type { ContinuationPlan } from '../approval/approval-flow-coordinator.js';
|
|
7
6
|
import type { ApprovalContext } from '../approval/approval-decision-policy.js';
|
|
8
|
-
import type {
|
|
9
|
-
import type { SessionIdSource } from './session-identity.js';
|
|
7
|
+
import type { ConversationRecord } from '../conversation/conversation-record.js';
|
|
10
8
|
export type ContinuationPlanApplierDeps = {
|
|
11
9
|
approvalFlow: ApprovalFlowCoordinator;
|
|
12
10
|
toolTracker: SessionToolTracker;
|
|
13
|
-
|
|
14
|
-
sessionId: SessionIdSource;
|
|
15
|
-
journal: AssistantTurnJournal;
|
|
11
|
+
record: ConversationRecord;
|
|
16
12
|
};
|
|
17
13
|
export declare class ContinuationPlanApplier {
|
|
18
14
|
private readonly deps;
|
|
19
15
|
constructor(deps: ContinuationPlanApplierDeps);
|
|
20
16
|
prepareInit(init: ContinuationInit): PreparedContinuation;
|
|
21
|
-
applyInitialSetup(prepared: PreparedContinuation
|
|
17
|
+
applyInitialSetup(prepared: PreparedContinuation): AsyncGenerator<ConversationEvent, void, void>;
|
|
22
18
|
recordPendingApproval(context: ApprovalContext): void;
|
|
23
|
-
applyNextPlan(nextPlan: ContinuationPlan, state:
|
|
19
|
+
applyNextPlan(nextPlan: ContinuationPlan, state: TurnProjectionState, isApproved: boolean): AsyncGenerator<ConversationEvent, void, void>;
|
|
24
20
|
}
|
|
25
21
|
//# sourceMappingURL=continuation-plan-applier.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation-plan-applier.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-plan-applier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"continuation-plan-applier.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-plan-applier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAC9G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,MAAM,MAAM,2BAA2B,GAAG;IACxC,YAAY,EAAE,uBAAuB,CAAC;IACtC,WAAW,EAAE,kBAAkB,CAAC;IAChC,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AAEF,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,2BAA2B,EAAI;IAElE,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,oBAAoB,CA8CxD;IAEM,iBAAiB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAKtG;IAED,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAWpD;IAEM,aAAa,CAClB,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,mBAAmB,EAC1B,UAAU,EAAE,OAAO,GAClB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAkB/C;CACF"}
|
|
@@ -6,6 +6,7 @@ export class ContinuationPlanApplier {
|
|
|
6
6
|
this.deps = deps;
|
|
7
7
|
}
|
|
8
8
|
prepareInit(init) {
|
|
9
|
+
this.deps.record.beginDecisionResolution(init.kind === 'abort_resolution' ? 'abortResolution' : 'continueRunStream');
|
|
9
10
|
if (init.kind === 'approval_decision') {
|
|
10
11
|
const plan = this.deps.approvalFlow.prepareContinuation(init.answer, init.rejectionReason);
|
|
11
12
|
if (!plan) {
|
|
@@ -20,17 +21,9 @@ export class ContinuationPlanApplier {
|
|
|
20
21
|
else
|
|
21
22
|
plan.pendingApprovalContext.state.reject?.(plan.pendingApprovalContext.interruption);
|
|
22
23
|
return {
|
|
23
|
-
state: plan.pendingApprovalContext.state,
|
|
24
|
-
interruption: plan.pendingApprovalContext.interruption,
|
|
25
|
-
toolCallArgumentsById: plan.pendingApprovalContext.toolCallArgumentsById,
|
|
26
|
-
previouslyEmittedCommandIds: plan.pendingApprovalContext.emittedCommandIds,
|
|
27
24
|
toolStartedEvent: undefined,
|
|
28
25
|
source: 'continueRunStream',
|
|
29
|
-
token: plan.pendingApprovalContext.token,
|
|
30
26
|
inputMode: plan.pendingApprovalContext.inputMode,
|
|
31
|
-
cumulativeUsage: plan.pendingApprovalContext.cumulativeUsage,
|
|
32
|
-
cumulativeCommandMessages: plan.pendingApprovalContext.cumulativeCommandMessages,
|
|
33
|
-
cumulativeTurnItems: plan.pendingApprovalContext.cumulativeTurnItems,
|
|
34
27
|
};
|
|
35
28
|
}
|
|
36
29
|
if (init.answer !== 'y') {
|
|
@@ -38,80 +31,53 @@ export class ContinuationPlanApplier {
|
|
|
38
31
|
const output = init.rejectionReason
|
|
39
32
|
? `Tool execution was not approved. User's reason: ${init.rejectionReason}`
|
|
40
33
|
: 'Tool execution was not approved.';
|
|
41
|
-
this.deps.
|
|
34
|
+
this.deps.record.recordAbortedApproval(output, output, callId);
|
|
42
35
|
}
|
|
43
36
|
return {
|
|
44
|
-
state: plan.pendingApprovalContext.state,
|
|
45
|
-
interruption: plan.pendingApprovalContext.interruption,
|
|
46
|
-
toolCallArgumentsById: plan.pendingApprovalContext.toolCallArgumentsById,
|
|
47
|
-
previouslyEmittedCommandIds: plan.pendingApprovalContext.emittedCommandIds,
|
|
48
37
|
toolStartedEvent: plan.toolStartedEvent,
|
|
49
38
|
source: 'continueRunStream',
|
|
50
|
-
token: plan.pendingApprovalContext.token,
|
|
51
39
|
inputMode: plan.pendingApprovalContext.inputMode,
|
|
52
|
-
cumulativeUsage: plan.pendingApprovalContext.cumulativeUsage,
|
|
53
|
-
cumulativeCommandMessages: plan.pendingApprovalContext.cumulativeCommandMessages,
|
|
54
|
-
cumulativeTurnItems: plan.pendingApprovalContext.cumulativeTurnItems,
|
|
55
40
|
};
|
|
56
41
|
}
|
|
57
42
|
const { abortedContext } = init;
|
|
58
43
|
this.deps.approvalFlow.prepareAbortResolution(abortedContext, init.userText);
|
|
59
44
|
return {
|
|
60
|
-
state: abortedContext.state,
|
|
61
|
-
interruption: abortedContext.interruption,
|
|
62
|
-
toolCallArgumentsById: abortedContext.toolCallArgumentsById,
|
|
63
|
-
previouslyEmittedCommandIds: abortedContext.emittedCommandIds,
|
|
64
45
|
toolStartedEvent: undefined,
|
|
65
46
|
source: 'abortResolution',
|
|
66
|
-
token: abortedContext.token,
|
|
67
47
|
inputMode: abortedContext.inputMode,
|
|
68
|
-
cumulativeUsage: abortedContext.cumulativeUsage,
|
|
69
|
-
cumulativeCommandMessages: abortedContext.cumulativeCommandMessages,
|
|
70
|
-
cumulativeTurnItems: abortedContext.cumulativeTurnItems,
|
|
71
48
|
};
|
|
72
49
|
}
|
|
73
|
-
async *applyInitialSetup(prepared
|
|
50
|
+
async *applyInitialSetup(prepared) {
|
|
74
51
|
if (prepared.toolStartedEvent) {
|
|
75
52
|
const filtered = this.deps.toolTracker.dedupeToolStarted(prepared.toolStartedEvent);
|
|
76
53
|
if (filtered)
|
|
77
54
|
yield filtered;
|
|
78
55
|
}
|
|
79
|
-
this.deps.toolTracker.clearArguments();
|
|
80
|
-
if (prepared.toolCallArgumentsById?.size) {
|
|
81
|
-
for (const [key, value] of prepared.toolCallArgumentsById.entries()) {
|
|
82
|
-
this.deps.toolTracker.argumentsById.set(key, value);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
state.setJournalSnapshot(this.deps.journal.getEvents());
|
|
86
56
|
}
|
|
87
57
|
recordPendingApproval(context) {
|
|
88
58
|
if (!context.callId) {
|
|
89
59
|
return;
|
|
90
60
|
}
|
|
91
|
-
this.deps.
|
|
61
|
+
this.deps.record.recordFunctionCall({
|
|
92
62
|
type: 'function_call',
|
|
93
63
|
callId: context.callId,
|
|
94
64
|
name: context.toolName,
|
|
95
65
|
arguments: context.argumentsText,
|
|
96
66
|
});
|
|
97
67
|
}
|
|
98
|
-
async *applyNextPlan(nextPlan, state,
|
|
68
|
+
async *applyNextPlan(nextPlan, state, isApproved) {
|
|
99
69
|
if (!isApproved) {
|
|
100
70
|
const callId = getCallIdFromObject(nextPlan.pendingApprovalContext.interruption);
|
|
101
|
-
this.deps.
|
|
71
|
+
this.deps.record.recordAbortedApproval('Tool execution was not approved.', 'Tool execution was not approved.', callId);
|
|
102
72
|
}
|
|
103
73
|
if (nextPlan.toolStartedEvent) {
|
|
104
74
|
const filtered = this.deps.toolTracker.dedupeToolStarted(nextPlan.toolStartedEvent);
|
|
105
75
|
if (filtered)
|
|
106
76
|
yield filtered;
|
|
107
77
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
this.deps.toolTracker.argumentsById.set(key, value);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
state.advanceFromPlan(nextPlan.pendingApprovalContext.state, nextPlan.pendingApprovalContext.interruption, nextPlan.pendingApprovalContext.inputMode, mergedEmittedIds, this.deps.journal.getEvents(), this.deps.toolTracker.activeCallIdsForCurrentTurn());
|
|
78
|
+
state.source = 'continueRunStream';
|
|
79
|
+
state.inputMode = nextPlan.pendingApprovalContext.inputMode ?? state.inputMode;
|
|
80
|
+
this.deps.record.beginDecisionResolution();
|
|
115
81
|
}
|
|
116
82
|
}
|
|
117
83
|
//# sourceMappingURL=continuation-plan-applier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"continuation-plan-applier.js","sourceRoot":"","sources":["../../../source/services/session/continuation-plan-applier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"continuation-plan-applier.js","sourceRoot":"","sources":["../../../source/services/session/continuation-plan-applier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ConversationRecord } from '../conversation/conversation-record.js';
|
|
1
2
|
import type { ConversationEvent } from '../conversation/conversation-events.js';
|
|
2
3
|
import type { ILoggingService } from '../service-interfaces.js';
|
|
3
4
|
import type { GenerationGuard } from '../generation-guard.js';
|
|
@@ -6,8 +7,7 @@ import type { DefaultConversationRecoveryPolicy } from '../retry/recovery-policy
|
|
|
6
7
|
import type { DefaultRecoveryExecutor } from '../retry/recovery-executor.js';
|
|
7
8
|
import type { RetryEventPresenter } from '../retry/retry-event-presenter.js';
|
|
8
9
|
import type { ClassifiedFailure, RetryCounts } from '../retry/retry-contracts.js';
|
|
9
|
-
import type {
|
|
10
|
-
import type { SessionToolTracker } from './session-tool-tracker.js';
|
|
10
|
+
import type { TurnProjectionState } from './turn-projection-state.js';
|
|
11
11
|
import type { SessionIdSource } from './session-identity.js';
|
|
12
12
|
export type ContinuationRecoveryHandlerDeps = {
|
|
13
13
|
breakChaining?: (reason: Extract<ClassifiedFailure, {
|
|
@@ -21,15 +21,13 @@ export type ContinuationRecoveryHandlerDeps = {
|
|
|
21
21
|
recoveryExecutor: DefaultRecoveryExecutor;
|
|
22
22
|
retryEventPresenter: RetryEventPresenter;
|
|
23
23
|
resolveRetryLimit: () => number;
|
|
24
|
-
|
|
24
|
+
record: ConversationRecord;
|
|
25
25
|
provider?: string;
|
|
26
26
|
};
|
|
27
27
|
export type ContinuationRecoveryResult = {
|
|
28
28
|
kind: 'stale';
|
|
29
29
|
} | {
|
|
30
30
|
kind: 'terminated';
|
|
31
|
-
} | {
|
|
32
|
-
kind: 'resume';
|
|
33
31
|
} | {
|
|
34
32
|
kind: 'fresh_start';
|
|
35
33
|
retryCounts: RetryCounts;
|
|
@@ -42,7 +40,7 @@ export declare class ContinuationRecoveryHandler {
|
|
|
42
40
|
constructor(deps: ContinuationRecoveryHandlerDeps);
|
|
43
41
|
handle(ctx: {
|
|
44
42
|
error: unknown;
|
|
45
|
-
state:
|
|
43
|
+
state: TurnProjectionState;
|
|
46
44
|
}): AsyncGenerator<ConversationEvent, ContinuationRecoveryResult, void>;
|
|
47
45
|
}
|
|
48
46
|
//# sourceMappingURL=continuation-recovery-handler.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"continuation-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,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,MAAM,EAAE,kBAAkB,CAAC;IAC3B,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;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,mBAAmB,CAAC;KAC5B,GAAG,cAAc,CAAC,iBAAiB,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAyKtE;CACF"}
|