@pentoshi/clai 4.11.12 → 4.11.14
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/README.md +14 -0
- package/dist/agent/compaction/summary-execution.d.ts +4 -1
- package/dist/agent/compaction/summary-execution.js +8 -2
- package/dist/agent/compaction/summary-execution.js.map +1 -1
- package/dist/agent/context/compact-with-summary.js +2 -1
- package/dist/agent/context/compact-with-summary.js.map +1 -1
- package/dist/agent/events.d.ts +1 -0
- package/dist/agent/runner.js +14 -0
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/tool-call-parser.js +1 -7
- package/dist/agent/tool-call-parser.js.map +1 -1
- package/dist/agent/tool-history.d.ts +2 -2
- package/dist/agent/tool-history.js +7 -8
- package/dist/agent/tool-history.js.map +1 -1
- package/dist/agent/turn/compaction-summarizer.d.ts +2 -1
- package/dist/agent/turn/compaction-summarizer.js +4 -1
- package/dist/agent/turn/compaction-summarizer.js.map +1 -1
- package/dist/agent/turn/loop/completion-interpretation.d.ts +1 -0
- package/dist/agent/turn/loop/completion-interpretation.js +7 -2
- package/dist/agent/turn/loop/completion-interpretation.js.map +1 -1
- package/dist/agent/turn/loop/run-rounds.js +6 -0
- package/dist/agent/turn/loop/run-rounds.js.map +1 -1
- package/dist/agent/turn/setup/compaction-services.d.ts +2 -1
- package/dist/agent/turn/setup/compaction-services.js +1 -0
- package/dist/agent/turn/setup/compaction-services.js.map +1 -1
- package/dist/app/adapters/agent-event-adapter.js +1 -0
- package/dist/app/adapters/agent-event-adapter.js.map +1 -1
- package/dist/app/controllers/session-compact-helper.d.ts +2 -1
- package/dist/app/controllers/session-compact-helper.js +19 -7
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/controllers/session-context-usage.d.ts +1 -1
- package/dist/app/controllers/session-context-usage.js +20 -6
- package/dist/app/controllers/session-context-usage.js.map +1 -1
- package/dist/app/controllers/session-controller.d.ts +1 -1
- package/dist/app/controllers/session-controller.js +2 -2
- package/dist/app/controllers/session-controller.js.map +1 -1
- package/dist/app/events/app-event.d.ts +1 -0
- package/dist/app/events/app-event.js.map +1 -1
- package/dist/commands/update/installers.js +17 -2
- package/dist/commands/update/installers.js.map +1 -1
- package/dist/llm/adapters/anthropic-tools.js +12 -0
- package/dist/llm/adapters/anthropic-tools.js.map +1 -1
- package/dist/llm/adapters/openai-tools.d.ts +1 -0
- package/dist/llm/adapters/openai-tools.js +28 -1
- package/dist/llm/adapters/openai-tools.js.map +1 -1
- package/dist/llm/adapters/tool-history.d.ts +4 -0
- package/dist/llm/adapters/tool-history.js +50 -0
- package/dist/llm/adapters/tool-history.js.map +1 -0
- package/dist/llm/artifacts/replay-selection.js +0 -7
- package/dist/llm/artifacts/replay-selection.js.map +1 -1
- package/dist/llm/capability/vision-patterns.d.ts +1 -0
- package/dist/llm/capability/vision-patterns.js +3 -2
- package/dist/llm/capability/vision-patterns.js.map +1 -1
- package/dist/llm/capability/vision-registry.js +3 -1
- package/dist/llm/capability/vision-registry.js.map +1 -1
- package/dist/llm/effort-fallback.js +3 -2
- package/dist/llm/effort-fallback.js.map +1 -1
- package/dist/llm/operation-usage.d.ts +1 -1
- package/dist/llm/operation-usage.js +13 -3
- package/dist/llm/operation-usage.js.map +1 -1
- package/dist/llm/reasoning-errors.d.ts +1 -0
- package/dist/llm/reasoning-errors.js +9 -0
- package/dist/llm/reasoning-errors.js.map +1 -1
- package/dist/llm/responses-complete.js +1 -1
- package/dist/llm/responses-complete.js.map +1 -1
- package/dist/llm/responses-request.js +28 -3
- package/dist/llm/responses-request.js.map +1 -1
- package/dist/llm/routing/attempt-complete.js +13 -8
- package/dist/llm/routing/attempt-complete.js.map +1 -1
- package/dist/llm/routing/attempt-request.js +4 -1
- package/dist/llm/routing/attempt-request.js.map +1 -1
- package/dist/llm/routing/attempt-stream.js +17 -17
- package/dist/llm/routing/attempt-stream.js.map +1 -1
- package/dist/llm/routing/error-classification.js +5 -0
- package/dist/llm/routing/error-classification.js.map +1 -1
- package/dist/llm/token-usage.js +1 -5
- package/dist/llm/token-usage.js.map +1 -1
- package/dist/llm/wire/capability-errors.js +13 -5
- package/dist/llm/wire/capability-errors.js.map +1 -1
- package/dist/llm/wire/chat-body.d.ts +2 -0
- package/dist/llm/wire/chat-body.js +55 -2
- package/dist/llm/wire/chat-body.js.map +1 -1
- package/dist/llm/wire/openai-complete.js +2 -2
- package/dist/llm/wire/openai-complete.js.map +1 -1
- package/dist/llm/wire/openai-stream.js +11 -1
- package/dist/llm/wire/openai-stream.js.map +1 -1
- package/dist/llm/wire/reasoning-artifacts.d.ts +2 -2
- package/dist/llm/wire/reasoning-artifacts.js +9 -5
- package/dist/llm/wire/reasoning-artifacts.js.map +1 -1
- package/dist/llm/wire/responses-first.d.ts +6 -2
- package/dist/llm/wire/responses-first.js +80 -215
- package/dist/llm/wire/responses-first.js.map +1 -1
- package/dist/llm/wire/responses-preflight.d.ts +11 -0
- package/dist/llm/wire/responses-preflight.js +127 -0
- package/dist/llm/wire/responses-preflight.js.map +1 -0
- package/dist/tui-v2/components/transcript/use-native-selection-copy.js +1 -7
- package/dist/tui-v2/components/transcript/use-native-selection-copy.js.map +1 -1
- package/dist/ui-core/bootstrap/composition-root.js +1 -1
- package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
- package/dist/version.generated.d.ts +2 -2
- package/dist/version.generated.js +2 -2
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@ import { isMissingReasoningContentError, isUnattributableRequestBodyError, } fro
|
|
|
4
4
|
import { createStreamEventGuard } from "../stream-events.js";
|
|
5
5
|
import { markStreamEmittedBytes } from "../stream-progress.js";
|
|
6
6
|
import { isToolsUnsupportedError, markTextOnlyModel, } from "../tool-protocol.js";
|
|
7
|
-
import { hasImageInput, preservedFailure, reasoningWireKey, revertVisionSubstitution, runRecordedProviderAttempt, successfulRequestSnapshot, withoutImages, withoutReasoning, } from "./attempt-request.js";
|
|
7
|
+
import { hasImageInput, preservedFailure, reasoningWireKey, requestForRoute, revertVisionSubstitution, runRecordedProviderAttempt, successfulRequestSnapshot, withoutImages, withoutReasoning, } from "./attempt-request.js";
|
|
8
8
|
import { effortCandidatesFor, isReasoningRelatedServerError, shouldContinueEffortLadder, shouldEnterEffortLadder, } from "./error-classification.js";
|
|
9
9
|
export async function tryStreamOnce(provider, providerId, request, model, auth, onToken, onStatus, reason, singleDispatch = false, onSuccessfulRequest) {
|
|
10
10
|
let emittedBytes = 0;
|
|
@@ -21,7 +21,7 @@ export async function tryStreamOnce(provider, providerId, request, model, auth,
|
|
|
21
21
|
downstreamEvents?.(event);
|
|
22
22
|
};
|
|
23
23
|
const activeRequest = {
|
|
24
|
-
...request,
|
|
24
|
+
...requestForRoute(request, providerId, model),
|
|
25
25
|
provider: providerId,
|
|
26
26
|
model,
|
|
27
27
|
...(onToolCallDelta || downstreamEvents
|
|
@@ -122,6 +122,21 @@ export async function tryStreamOnce(provider, providerId, request, model, auth,
|
|
|
122
122
|
return result;
|
|
123
123
|
}
|
|
124
124
|
catch (error) {
|
|
125
|
+
if (emittedBytes === 0 &&
|
|
126
|
+
hasImageInput(activeRequest) &&
|
|
127
|
+
isImageInputUnsupportedError(error)) {
|
|
128
|
+
learnModelVisionCapability(providerId, model, false);
|
|
129
|
+
if (singleDispatch)
|
|
130
|
+
throw markStreamEmittedBytes(error, emittedBytes);
|
|
131
|
+
onStatus?.(`ℹ ${providerId}/${model} rejected image input — continuing without images; their contents are unavailable to this model`);
|
|
132
|
+
const textOnlyRequest = requestForRoute(withoutImages(activeRequest), providerId, model);
|
|
133
|
+
try {
|
|
134
|
+
return await runAttempt(textOnlyRequest, "adaptation");
|
|
135
|
+
}
|
|
136
|
+
catch (retryError) {
|
|
137
|
+
throw markStreamEmittedBytes(preservedFailure(retryError, error), emittedBytes);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
125
140
|
if (emittedBytes === 0 &&
|
|
126
141
|
activeRequest.tools?.length &&
|
|
127
142
|
isToolsUnsupportedError(error)) {
|
|
@@ -234,21 +249,6 @@ export async function tryStreamOnce(provider, providerId, request, model, auth,
|
|
|
234
249
|
throw markStreamEmittedBytes(preservedFailure(retryError, error), emittedBytes);
|
|
235
250
|
}
|
|
236
251
|
}
|
|
237
|
-
if (emittedBytes === 0 &&
|
|
238
|
-
hasImageInput(activeRequest) &&
|
|
239
|
-
isImageInputUnsupportedError(error)) {
|
|
240
|
-
learnModelVisionCapability(providerId, model, false);
|
|
241
|
-
if (singleDispatch)
|
|
242
|
-
throw markStreamEmittedBytes(error, emittedBytes);
|
|
243
|
-
onStatus?.(`ℹ ${providerId}/${model} rejected image input — retrying without the attached image(s)`);
|
|
244
|
-
const textOnlyRequest = withoutImages(activeRequest);
|
|
245
|
-
try {
|
|
246
|
-
return await runAttempt(textOnlyRequest, "adaptation");
|
|
247
|
-
}
|
|
248
|
-
catch (retryError) {
|
|
249
|
-
throw markStreamEmittedBytes(preservedFailure(retryError, error), emittedBytes);
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
252
|
if (emittedBytes === 0 && !singleDispatch) {
|
|
253
253
|
const restored = revertVisionSubstitution(providerId, model, activeRequest, error);
|
|
254
254
|
if (restored) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attempt-stream.js","sourceRoot":"","sources":["../../../src/llm/routing/attempt-stream.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,8BAA8B,EAC9B,gCAAgC,GACjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EACL,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,wBAAwB,EACxB,0BAA0B,EAC1B,yBAAyB,EACzB,aAAa,EACb,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,mBAAmB,EACnB,6BAA6B,EAC7B,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAqB,EACrB,UAAsB,EACtB,OAA0B,EAC1B,KAAa,EACb,IAAkB,EAClB,OAAgC,EAChC,QAAiD,EACjD,MAA+B,EAC/B,cAAc,GAAG,KAAK,EACtB,mBAC6D;IAE7D,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,wBAAwB,GAAG,CAAC,CAAC;IACjC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAChD,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAC/C,IAAI,KAAK,GAAG,sBAAsB,EAAE,CAAC;IACrC,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IACjD,MAAM,SAAS,GAAG,CAAC,KAA0B,EAAQ,EAAE;QACrD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YAC1E,YAAY,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;QACpC,CAAC;QACD,gBAAgB,EAAE,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC;IACF,MAAM,aAAa,GAAG;QACpB,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"attempt-stream.js","sourceRoot":"","sources":["../../../src/llm/routing/attempt-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isReasoningUnsupported, learnedRouteEfforts, } from "../capabilities.js";
|
|
2
|
+
import { isInvalidReasoningContentError } from "../reasoning-errors.js";
|
|
2
3
|
import { fallbackEffortsFor } from "../effort-fallback.js";
|
|
3
4
|
import { isReasoningUnsupportedError, ProviderError, STREAM_STALL_MARKER, } from "../http.js";
|
|
4
5
|
import { rateLimitWaitMsFor } from "../key-rotation.js";
|
|
@@ -104,6 +105,8 @@ function isOpaqueParameterRejection(error, effort) {
|
|
|
104
105
|
return !NON_EFFORT_REJECTION_RE.test(`${error.message}\n${error.body ?? ""}`);
|
|
105
106
|
}
|
|
106
107
|
export function shouldContinueEffortLadder(error) {
|
|
108
|
+
if (isInvalidReasoningContentError(error))
|
|
109
|
+
return false;
|
|
107
110
|
return (isReasoningUnsupportedError(error) || isReasoningRelatedServerError(error));
|
|
108
111
|
}
|
|
109
112
|
export function effortCandidatesFor(providerId, model, requested) {
|
|
@@ -133,6 +136,8 @@ export function effortCandidatesFor(providerId, model, requested) {
|
|
|
133
136
|
return [EFFORT_SCALE[lower]];
|
|
134
137
|
}
|
|
135
138
|
export function shouldEnterEffortLadder(error, thinking, providerId, model, singleDispatch) {
|
|
139
|
+
if (isInvalidReasoningContentError(error))
|
|
140
|
+
return false;
|
|
136
141
|
if (isReasoningUnsupportedError(error))
|
|
137
142
|
return true;
|
|
138
143
|
if (singleDispatch)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-classification.js","sourceRoot":"","sources":["../../../src/llm/routing/error-classification.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"error-classification.js","sourceRoot":"","sources":["../../../src/llm/routing/error-classification.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/token-usage.js
CHANGED
|
@@ -71,11 +71,7 @@ export function withReasoningObservation(usage, observed) {
|
|
|
71
71
|
export function effectivePromptTokens(usage) {
|
|
72
72
|
if (!usage || usage.promptTokensKnown === false)
|
|
73
73
|
return undefined;
|
|
74
|
-
|
|
75
|
-
const created = usage.cacheCreationTokens ?? 0;
|
|
76
|
-
return cached + created > usage.promptTokens
|
|
77
|
-
? usage.promptTokens + cached + created
|
|
78
|
-
: usage.promptTokens;
|
|
74
|
+
return usage.promptTokens;
|
|
79
75
|
}
|
|
80
76
|
export function estimateUsageFromMessages(messages) {
|
|
81
77
|
const promptTokens = estimateMessagesTokens(messages);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../src/llm/token-usage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../src/llm/token-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { modelAcceptsImages } from "../capabilities.js";
|
|
2
|
-
import { isMissingReasoningContentError } from "../reasoning-errors.js";
|
|
2
|
+
import { isInvalidReasoningContentError, isMissingReasoningContentError, } from "../reasoning-errors.js";
|
|
3
3
|
export function isReasoningUnsupportedError(error) {
|
|
4
|
-
if (isMissingReasoningContentError(error)
|
|
4
|
+
if (isMissingReasoningContentError(error) ||
|
|
5
|
+
isInvalidReasoningContentError(error))
|
|
5
6
|
return false;
|
|
6
7
|
const status = error && typeof error === "object" && "status" in error
|
|
7
8
|
? Number(error.status)
|
|
@@ -65,8 +66,9 @@ export function isImageInputUnsupportedError(error) {
|
|
|
65
66
|
: "";
|
|
66
67
|
const message = error instanceof Error ? error.message : String(error);
|
|
67
68
|
const hay = `${message}\n${body}`.toLowerCase();
|
|
69
|
+
const textOnlyContentType = /(?:content(?:\[\d+\]|\.\d+)?(?:\.type)?|(?:\*+\.)+type|content[_ ]?type)[^\n]{0,100}(?:取值范围|(?:allowed|supported|expected|valid)(?:\s+\w+){0,3}|must be(?: one of)?|only)\s*[::]?\s*\[\s*['"]text['"]\s*\]/.test(hay);
|
|
68
70
|
const mentionsImageInput = /image_url|image url|inlinedata|inline_data|\bimages?\b|multimodal|\bvision\b|media_type|image content|content\[\d+\]|content\.\d+|parts\[\d+\]/.test(hay);
|
|
69
|
-
if (!mentionsImageInput)
|
|
71
|
+
if (!mentionsImageInput && !textOnlyContentType)
|
|
70
72
|
return false;
|
|
71
73
|
if (status !== undefined &&
|
|
72
74
|
status !== 400 &&
|
|
@@ -74,14 +76,20 @@ export function isImageInputUnsupportedError(error) {
|
|
|
74
76
|
status !== 422) {
|
|
75
77
|
return false;
|
|
76
78
|
}
|
|
77
|
-
return /not support|unsupported|does not accept|cannot process|invalid[_ ]?(?:request[_ ]?)?(?:argument|parameter|field|type|value)?|unknown|unrecognized|not a valid|not allowed|only text|text[- ]only|expected a string|must be a string|additional propert/.test(hay);
|
|
79
|
+
return textOnlyContentType || /not support|unsupported|does not accept|cannot process|invalid[_ ]?(?:request[_ ]?)?(?:argument|parameter|field|type|value)?|unknown|unrecognized|not a valid|not allowed|only text|text[- ]only|expected a string|must be a string|additional propert/.test(hay);
|
|
78
80
|
}
|
|
79
81
|
export function stripImagesFromMessages(messages) {
|
|
80
82
|
return messages.map((message) => {
|
|
81
83
|
if (!message.images?.length)
|
|
82
84
|
return message;
|
|
83
85
|
const { images: _images, ...rest } = message;
|
|
84
|
-
return
|
|
86
|
+
return {
|
|
87
|
+
...rest,
|
|
88
|
+
content: [
|
|
89
|
+
message.content,
|
|
90
|
+
`[Image input unavailable: ${message.images.length} attached image(s) were not sent to this model. Do not infer their contents; use a vision-capable model to inspect them.]`,
|
|
91
|
+
].filter(Boolean).join("\n\n"),
|
|
92
|
+
};
|
|
85
93
|
});
|
|
86
94
|
}
|
|
87
95
|
export function imageCapableMessages(provider, model, messages) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability-errors.js","sourceRoot":"","sources":["../../../src/llm/wire/capability-errors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"capability-errors.js","sourceRoot":"","sources":["../../../src/llm/wire/capability-errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export declare function toOpenAiMessages(messages: ChatMessage[], supportsVision
|
|
|
5
5
|
target: ReasoningArtifactReplayTarget;
|
|
6
6
|
observe?: ReasoningArtifactReplayObserver | undefined;
|
|
7
7
|
forceScope?: boolean | undefined;
|
|
8
|
+
portableToolHistory?: ReadonlySet<ChatMessage> | undefined;
|
|
8
9
|
}): Array<Record<string, unknown>>;
|
|
9
10
|
export declare function isOpenAiReasoningModel(model: string): boolean;
|
|
10
11
|
export interface ChatCompletionsBodyOptions {
|
|
@@ -24,6 +25,7 @@ export interface ChatCompletionsBodyOptions {
|
|
|
24
25
|
replayTarget?: ReasoningArtifactReplayTarget | undefined;
|
|
25
26
|
reasoningArtifactReplayObserver?: ReasoningArtifactReplayObserver | undefined;
|
|
26
27
|
forceReasoningReplay?: boolean | undefined;
|
|
28
|
+
portableToolHistory?: ReadonlySet<ChatMessage> | undefined;
|
|
27
29
|
control?: ReasoningControlContext | undefined;
|
|
28
30
|
outputTokenLimit?: number | undefined;
|
|
29
31
|
resolvedSampling?: {
|
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
import { openAiToolBodyFields, toOpenAiToolMessages, } from "../adapters/openai-tools.js";
|
|
2
|
+
import { isTextOnlyModel } from "../tool-protocol.js";
|
|
2
3
|
import { cacheAffinityKey, sessionCacheAffinityKey } from "../cache-affinity.js";
|
|
3
4
|
import { currentSessionAffinity } from "../session-affinity.js";
|
|
4
5
|
import { isReasoningUnsupported, modelSupportsThinking, } from "../capabilities.js";
|
|
5
6
|
import { modelMaxOutputTokens } from "../context-windows.js";
|
|
7
|
+
import { reasoningArtifactText, reasoningArtifactsForMessage, selectReasoningArtifactsForReplay, } from "../reasoning-artifacts.js";
|
|
6
8
|
import { resolveSampling } from "../sampling.js";
|
|
7
9
|
import { singleLeadingSystemMessages } from "../system-messages.js";
|
|
10
|
+
import { stripImagesFromMessages } from "./capability-errors.js";
|
|
8
11
|
import { buildReasoningPayload, } from "./reasoning-payload.js";
|
|
9
12
|
export function toOpenAiMessages(messages, supportsVision = true, replay) {
|
|
10
|
-
|
|
13
|
+
const wireMessages = supportsVision
|
|
14
|
+
? messages
|
|
15
|
+
: stripImagesFromMessages(messages);
|
|
16
|
+
const portableToolHistory = replay?.portableToolHistory
|
|
17
|
+
? new Set(wireMessages.filter((message, index) => replay.portableToolHistory.has(messages[index])))
|
|
18
|
+
: undefined;
|
|
19
|
+
return toOpenAiToolMessages(wireMessages, (message) => {
|
|
11
20
|
if (supportsVision && message.images && message.images.length > 0) {
|
|
12
21
|
const parts = [];
|
|
13
22
|
if (message.content)
|
|
@@ -24,7 +33,12 @@ export function toOpenAiMessages(messages, supportsVision = true, replay) {
|
|
|
24
33
|
return parts;
|
|
25
34
|
}
|
|
26
35
|
return message.content;
|
|
27
|
-
}, replay
|
|
36
|
+
}, replay
|
|
37
|
+
? {
|
|
38
|
+
...replay,
|
|
39
|
+
...(portableToolHistory ? { portableToolHistory } : {}),
|
|
40
|
+
}
|
|
41
|
+
: undefined);
|
|
28
42
|
}
|
|
29
43
|
export function isOpenAiReasoningModel(model) {
|
|
30
44
|
const m = model.toLowerCase();
|
|
@@ -94,6 +108,9 @@ function emitChatCompletionsBody(options) {
|
|
|
94
108
|
target: options.replayTarget,
|
|
95
109
|
observe: options.reasoningArtifactReplayObserver,
|
|
96
110
|
...(options.forceReasoningReplay ? { forceScope: true } : {}),
|
|
111
|
+
...(options.portableToolHistory
|
|
112
|
+
? { portableToolHistory: options.portableToolHistory }
|
|
113
|
+
: {}),
|
|
97
114
|
}
|
|
98
115
|
: undefined),
|
|
99
116
|
stream: options.stream,
|
|
@@ -141,7 +158,42 @@ function emitChatCompletionsBody(options) {
|
|
|
141
158
|
export function buildChatBody(options) {
|
|
142
159
|
return emitChatCompletionsBody(options);
|
|
143
160
|
}
|
|
161
|
+
function portableToolHistory(plan, forceReasoningReplay) {
|
|
162
|
+
const portable = new Set();
|
|
163
|
+
for (const [index, message] of plan.timeline.messages.entries()) {
|
|
164
|
+
if (message.role !== "assistant" || !message.toolCalls?.length)
|
|
165
|
+
continue;
|
|
166
|
+
const decisions = plan.replay.decisions.filter((entry) => entry.messageIndex === index);
|
|
167
|
+
const foreignArtifact = decisions.some(({ decision }) => decision.action === "omitted" &&
|
|
168
|
+
!decision.source.legacy &&
|
|
169
|
+
(decision.reason === "provider-mismatch" ||
|
|
170
|
+
decision.reason === "dialect-mismatch" ||
|
|
171
|
+
decision.reason === "model-mismatch" ||
|
|
172
|
+
decision.reason === "endpoint-unknown" ||
|
|
173
|
+
decision.reason === "endpoint-mismatch"));
|
|
174
|
+
const hasCompatibleArtifact = decisions.some(({ decision }) => decision.action === "replayed");
|
|
175
|
+
const replayableText = selectReasoningArtifactsForReplay({
|
|
176
|
+
artifacts: reasoningArtifactsForMessage(message),
|
|
177
|
+
target: plan.replay.target,
|
|
178
|
+
context: { hasToolCalls: true, forceScope: forceReasoningReplay },
|
|
179
|
+
}).some((artifact) => artifact.kind === "plaintext" && Boolean(reasoningArtifactText(artifact)?.trim()));
|
|
180
|
+
if (isTextOnlyModel(plan.route.provider, plan.route.model) ||
|
|
181
|
+
(foreignArtifact && !hasCompatibleArtifact) ||
|
|
182
|
+
(forceReasoningReplay && !replayableText)) {
|
|
183
|
+
portable.add(message);
|
|
184
|
+
const callIds = new Set(message.toolCalls.map((call) => call.id));
|
|
185
|
+
for (let resultIndex = index + 1; plan.timeline.messages[resultIndex]?.role === "tool"; resultIndex += 1) {
|
|
186
|
+
const result = plan.timeline.messages[resultIndex];
|
|
187
|
+
if (result.toolCallId && callIds.has(result.toolCallId)) {
|
|
188
|
+
portable.add(result);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
return portable.size ? portable : undefined;
|
|
194
|
+
}
|
|
144
195
|
export function chatCompletionsBodyFromPlan(plan, extras = {}) {
|
|
196
|
+
const portableHistory = portableToolHistory(plan, Boolean(extras.forceReasoningReplay));
|
|
145
197
|
return emitChatCompletionsBody({
|
|
146
198
|
model: plan.route.model,
|
|
147
199
|
providerId: plan.route.provider,
|
|
@@ -176,6 +228,7 @@ export function chatCompletionsBodyFromPlan(plan, extras = {}) {
|
|
|
176
228
|
replayTarget: plan.replay.target,
|
|
177
229
|
reasoningArtifactReplayObserver: extras.reasoningArtifactReplayObserver,
|
|
178
230
|
...(extras.forceReasoningReplay ? { forceReasoningReplay: true } : {}),
|
|
231
|
+
...(portableHistory ? { portableToolHistory: portableHistory } : {}),
|
|
179
232
|
});
|
|
180
233
|
}
|
|
181
234
|
//# sourceMappingURL=chat-body.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-body.js","sourceRoot":"","sources":["../../../src/llm/wire/chat-body.ts"],"names":[],"mappings":"AASA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-body.js","sourceRoot":"","sources":["../../../src/llm/wire/chat-body.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import { readJson } from "./response-errors.js";
|
|
|
12
12
|
import { openAiCompatibleCompleteViaResponses } from "./responses-first.js";
|
|
13
13
|
export async function openAiCompatibleComplete(options) {
|
|
14
14
|
const viaResponses = options.responsesFirst
|
|
15
|
-
? await openAiCompatibleCompleteViaResponses(options)
|
|
15
|
+
? await openAiCompatibleCompleteViaResponses(options, (probe) => openAiCompatibleComplete({ ...options, ...probe, responsesFirst: false }))
|
|
16
16
|
: undefined;
|
|
17
17
|
if (viaResponses)
|
|
18
18
|
return { ...viaResponses, api: "responses" };
|
|
@@ -61,7 +61,7 @@ export async function openAiCompatibleComplete(options) {
|
|
|
61
61
|
}
|
|
62
62
|
let data;
|
|
63
63
|
try {
|
|
64
|
-
data = await readJson(response);
|
|
64
|
+
data = await readJson(response, options.signal);
|
|
65
65
|
}
|
|
66
66
|
catch (error) {
|
|
67
67
|
if (error instanceof ProviderError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-complete.js","sourceRoot":"","sources":["../../../src/llm/wire/openai-complete.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EACL,WAAW,EACX,2BAA2B,EAE3B,4BAA4B,EAE5B,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,OAqB9C;IACC,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc;QACzC,CAAC,CAAC,MAAM,oCAAoC,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-complete.js","sourceRoot":"","sources":["../../../src/llm/wire/openai-complete.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,14 @@ export async function openAiCompatibleStream(options) {
|
|
|
22
22
|
? { onToolCallDelta: options.onToolCallDelta }
|
|
23
23
|
: {}),
|
|
24
24
|
...(options.onStreamEvent ? { onStreamEvent: options.onStreamEvent } : {}),
|
|
25
|
-
})
|
|
25
|
+
}, (probe) => openAiCompatibleStream({
|
|
26
|
+
...options,
|
|
27
|
+
...probe,
|
|
28
|
+
responsesFirst: false,
|
|
29
|
+
onToken: () => { },
|
|
30
|
+
onToolCallDelta: undefined,
|
|
31
|
+
onStreamEvent: undefined,
|
|
32
|
+
}))
|
|
26
33
|
: undefined;
|
|
27
34
|
if (viaResponses)
|
|
28
35
|
return { ...viaResponses, api: "responses" };
|
|
@@ -470,6 +477,9 @@ export async function openAiCompatibleStream(options) {
|
|
|
470
477
|
catch {
|
|
471
478
|
continue;
|
|
472
479
|
}
|
|
480
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
|
|
481
|
+
continue;
|
|
482
|
+
}
|
|
473
483
|
if (parsed.error) {
|
|
474
484
|
const detail = typeof parsed.error === "string"
|
|
475
485
|
? parsed.error
|