@steipete/summarize 0.12.0 → 0.13.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/CHANGELOG.md +36 -1
- package/README.md +41 -17
- package/dist/cli.js +1 -1
- package/dist/esm/cache-keys.js +10 -2
- package/dist/esm/cache-keys.js.map +1 -1
- package/dist/esm/cache.js +1 -1
- package/dist/esm/config/parse-helpers.js +6 -1
- package/dist/esm/config/parse-helpers.js.map +1 -1
- package/dist/esm/config/sections.js +35 -1
- package/dist/esm/config/sections.js.map +1 -1
- package/dist/esm/costs.js.map +1 -1
- package/dist/esm/daemon/agent-model.js +56 -8
- package/dist/esm/daemon/agent-model.js.map +1 -1
- package/dist/esm/daemon/chat.js +52 -4
- package/dist/esm/daemon/chat.js.map +1 -1
- package/dist/esm/daemon/cli.js +100 -5
- package/dist/esm/daemon/cli.js.map +1 -1
- package/dist/esm/daemon/env-snapshot.js +2 -0
- package/dist/esm/daemon/env-snapshot.js.map +1 -1
- package/dist/esm/daemon/flow-context.js +76 -73
- package/dist/esm/daemon/flow-context.js.map +1 -1
- package/dist/esm/daemon/models.js +10 -0
- package/dist/esm/daemon/models.js.map +1 -1
- package/dist/esm/daemon/schtasks.js +101 -5
- package/dist/esm/daemon/schtasks.js.map +1 -1
- package/dist/esm/daemon/server.js +8 -1
- package/dist/esm/daemon/server.js.map +1 -1
- package/dist/esm/daemon/windows-container.js +21 -0
- package/dist/esm/daemon/windows-container.js.map +1 -0
- package/dist/esm/llm/cli-provider-output.js +225 -1
- package/dist/esm/llm/cli-provider-output.js.map +1 -1
- package/dist/esm/llm/cli.js +95 -7
- package/dist/esm/llm/cli.js.map +1 -1
- package/dist/esm/llm/generate-text-document.js.map +1 -1
- package/dist/esm/llm/generate-text-shared.js +22 -3
- package/dist/esm/llm/generate-text-shared.js.map +1 -1
- package/dist/esm/llm/generate-text-stream.js +34 -1
- package/dist/esm/llm/generate-text-stream.js.map +1 -1
- package/dist/esm/llm/generate-text.js +33 -6
- package/dist/esm/llm/generate-text.js.map +1 -1
- package/dist/esm/llm/github-models.js +45 -0
- package/dist/esm/llm/github-models.js.map +1 -0
- package/dist/esm/llm/html-to-markdown.js.map +1 -1
- package/dist/esm/llm/model-id.js +18 -2
- package/dist/esm/llm/model-id.js.map +1 -1
- package/dist/esm/llm/provider-profile.js +44 -2
- package/dist/esm/llm/provider-profile.js.map +1 -1
- package/dist/esm/llm/providers/models.js +6 -1
- package/dist/esm/llm/providers/models.js.map +1 -1
- package/dist/esm/llm/providers/openai.js +243 -5
- package/dist/esm/llm/providers/openai.js.map +1 -1
- package/dist/esm/llm/transcript-to-markdown.js.map +1 -1
- package/dist/esm/media-cache.js +3 -0
- package/dist/esm/media-cache.js.map +1 -1
- package/dist/esm/model-auto-cli.js +7 -5
- package/dist/esm/model-auto-cli.js.map +1 -1
- package/dist/esm/model-spec.js +39 -2
- package/dist/esm/model-spec.js.map +1 -1
- package/dist/esm/run/attachments.js.map +1 -1
- package/dist/esm/run/cli-fallback-state.js +6 -1
- package/dist/esm/run/cli-fallback-state.js.map +1 -1
- package/dist/esm/run/env.js +21 -3
- package/dist/esm/run/env.js.map +1 -1
- package/dist/esm/run/flows/asset/summary-attempts.js +9 -1
- package/dist/esm/run/flows/asset/summary-attempts.js.map +1 -1
- package/dist/esm/run/flows/asset/summary.js +11 -0
- package/dist/esm/run/flows/asset/summary.js.map +1 -1
- package/dist/esm/run/flows/url/extraction-session.js +174 -0
- package/dist/esm/run/flows/url/extraction-session.js.map +1 -0
- package/dist/esm/run/flows/url/fetch-options.js +32 -0
- package/dist/esm/run/flows/url/fetch-options.js.map +1 -0
- package/dist/esm/run/flows/url/flow-progress.js +11 -7
- package/dist/esm/run/flows/url/flow-progress.js.map +1 -1
- package/dist/esm/run/flows/url/flow.js +64 -385
- package/dist/esm/run/flows/url/flow.js.map +1 -1
- package/dist/esm/run/flows/url/markdown.js +18 -1
- package/dist/esm/run/flows/url/markdown.js.map +1 -1
- package/dist/esm/run/flows/url/progress-status-state.js +28 -0
- package/dist/esm/run/flows/url/progress-status-state.js.map +1 -0
- package/dist/esm/run/flows/url/progress-status.js +18 -23
- package/dist/esm/run/flows/url/progress-status.js.map +1 -1
- package/dist/esm/run/flows/url/slides-session.js +159 -0
- package/dist/esm/run/flows/url/slides-session.js.map +1 -0
- package/dist/esm/run/flows/url/summary-finish.js +10 -4
- package/dist/esm/run/flows/url/summary-finish.js.map +1 -1
- package/dist/esm/run/flows/url/summary-resolution.js +8 -1
- package/dist/esm/run/flows/url/summary-resolution.js.map +1 -1
- package/dist/esm/run/flows/url/summary.js +115 -149
- package/dist/esm/run/flows/url/summary.js.map +1 -1
- package/dist/esm/run/flows/url/types.js +31 -1
- package/dist/esm/run/flows/url/types.js.map +1 -1
- package/dist/esm/run/flows/url/video-only.js +68 -0
- package/dist/esm/run/flows/url/video-only.js.map +1 -0
- package/dist/esm/run/help.js +6 -2
- package/dist/esm/run/help.js.map +1 -1
- package/dist/esm/run/run-config.js +1 -1
- package/dist/esm/run/run-config.js.map +1 -1
- package/dist/esm/run/run-models.js +35 -5
- package/dist/esm/run/run-models.js.map +1 -1
- package/dist/esm/run/run-settings-parse.js +4 -0
- package/dist/esm/run/run-settings-parse.js.map +1 -1
- package/dist/esm/run/run-settings.js +6 -0
- package/dist/esm/run/run-settings.js.map +1 -1
- package/dist/esm/run/runner-contexts.js +70 -64
- package/dist/esm/run/runner-contexts.js.map +1 -1
- package/dist/esm/run/runner-execution.js +22 -2
- package/dist/esm/run/runner-execution.js.map +1 -1
- package/dist/esm/run/runner-plan.js +369 -0
- package/dist/esm/run/runner-plan.js.map +1 -0
- package/dist/esm/run/runner-slides.js +14 -3
- package/dist/esm/run/runner-slides.js.map +1 -1
- package/dist/esm/run/runner.js +50 -398
- package/dist/esm/run/runner.js.map +1 -1
- package/dist/esm/run/slides-cli.js +3 -2
- package/dist/esm/run/slides-cli.js.map +1 -1
- package/dist/esm/run/streaming.js +1 -0
- package/dist/esm/run/streaming.js.map +1 -1
- package/dist/esm/run/summary-engine.js +24 -0
- package/dist/esm/run/summary-engine.js.map +1 -1
- package/dist/esm/run/summary-llm.js.map +1 -1
- package/dist/esm/shared/slides-text.js +2 -0
- package/dist/esm/shared/slides-text.js.map +1 -0
- package/dist/esm/slides/extract.js +43 -66
- package/dist/esm/slides/extract.js.map +1 -1
- package/dist/esm/slides/index.js +2 -1
- package/dist/esm/slides/index.js.map +1 -1
- package/dist/esm/slides/ingest.js +27 -0
- package/dist/esm/slides/ingest.js.map +1 -1
- package/dist/esm/slides/source.js +80 -0
- package/dist/esm/slides/source.js.map +1 -0
- package/dist/esm/tty/progress/fetch-html.js +6 -0
- package/dist/esm/tty/progress/fetch-html.js.map +1 -1
- package/dist/esm/tty/progress/transcript-state.js +202 -0
- package/dist/esm/tty/progress/transcript-state.js.map +1 -0
- package/dist/esm/tty/progress/transcript.js +43 -207
- package/dist/esm/tty/progress/transcript.js.map +1 -1
- package/dist/esm/tty/spinner.js +14 -6
- package/dist/esm/tty/spinner.js.map +1 -1
- package/dist/esm/tty/website-progress.js +11 -0
- package/dist/esm/tty/website-progress.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/cache-keys.d.ts +1 -1
- package/dist/types/cache.d.ts +1 -1
- package/dist/types/config/sections.d.ts +2 -1
- package/dist/types/config/types.d.ts +9 -1
- package/dist/types/costs.d.ts +1 -1
- package/dist/types/daemon/env-snapshot.d.ts +1 -1
- package/dist/types/daemon/flow-context.d.ts +1 -1
- package/dist/types/daemon/models.d.ts +2 -0
- package/dist/types/daemon/schtasks.d.ts +2 -1
- package/dist/types/daemon/server.d.ts +1 -0
- package/dist/types/daemon/windows-container.d.ts +1 -0
- package/dist/types/llm/cli-provider-output.d.ts +10 -1
- package/dist/types/llm/generate-text-document.d.ts +2 -1
- package/dist/types/llm/generate-text-shared.d.ts +7 -0
- package/dist/types/llm/generate-text-stream.d.ts +2 -1
- package/dist/types/llm/generate-text.d.ts +3 -2
- package/dist/types/llm/github-models.d.ts +5 -0
- package/dist/types/llm/html-to-markdown.d.ts +2 -1
- package/dist/types/llm/model-id.d.ts +1 -1
- package/dist/types/llm/provider-profile.d.ts +4 -4
- package/dist/types/llm/providers/openai.d.ts +9 -5
- package/dist/types/llm/providers/types.d.ts +1 -0
- package/dist/types/llm/transcript-to-markdown.d.ts +2 -1
- package/dist/types/model-spec.d.ts +4 -3
- package/dist/types/run/attachments.d.ts +3 -2
- package/dist/types/run/env.d.ts +5 -0
- package/dist/types/run/flows/asset/summary.d.ts +10 -0
- package/dist/types/run/flows/url/extraction-session.d.ts +22 -0
- package/dist/types/run/flows/url/fetch-options.d.ts +29 -0
- package/dist/types/run/flows/url/flow-progress.d.ts +3 -1
- package/dist/types/run/flows/url/markdown.d.ts +1 -1
- package/dist/types/run/flows/url/progress-status-state.d.ts +17 -0
- package/dist/types/run/flows/url/progress-status.d.ts +1 -0
- package/dist/types/run/flows/url/slides-session.d.ts +26 -0
- package/dist/types/run/flows/url/types.d.ts +16 -0
- package/dist/types/run/flows/url/video-only.d.ts +27 -0
- package/dist/types/run/run-settings.d.ts +2 -1
- package/dist/types/run/runner-contexts.d.ts +3 -28
- package/dist/types/run/runner-execution.d.ts +1 -0
- package/dist/types/run/runner-plan.d.ts +19 -0
- package/dist/types/run/runner-slides.d.ts +2 -1
- package/dist/types/run/streaming.d.ts +2 -1
- package/dist/types/run/summary-engine.d.ts +1 -1
- package/dist/types/run/summary-llm.d.ts +2 -1
- package/dist/types/run/types.d.ts +3 -2
- package/dist/types/shared/slides-text.d.ts +1 -0
- package/dist/types/slides/extract.d.ts +1 -6
- package/dist/types/slides/index.d.ts +2 -1
- package/dist/types/slides/source.d.ts +8 -0
- package/dist/types/tty/progress/fetch-html.d.ts +1 -0
- package/dist/types/tty/progress/transcript-state.d.ts +27 -0
- package/dist/types/tty/progress/transcript.d.ts +1 -0
- package/dist/types/tty/spinner.d.ts +1 -0
- package/dist/types/version.d.ts +1 -1
- package/docs/README.md +1 -1
- package/docs/agent.md +1 -1
- package/docs/assets/site.css +11 -0
- package/docs/chrome-extension.md +7 -1
- package/docs/cli.md +24 -6
- package/docs/config.md +19 -5
- package/docs/extract-only.md +2 -2
- package/docs/firecrawl.md +2 -1
- package/docs/llm.md +29 -3
- package/docs/media.md +6 -0
- package/docs/releasing.md +9 -12
- package/docs/site/docs/chrome-extension.html +1 -1
- package/docs/transcript-provider-flow.md +7 -0
- package/docs/website.md +2 -1
- package/package.json +15 -14
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"windows-container.js","sourceRoot":"","sources":["../../../src/daemon/windows-container.ts"],"names":[],"mappings":"AAAA,MAAM,kCAAkC,GAAG,kCAAkC,CAAC;AAC9E,MAAM,yBAAyB,GAAG;IAChC,+BAA+B;IAC/B,6BAA6B;IAC7B,sBAAsB;CACd,CAAC;AAEX,SAAS,gBAAgB,CAAC,KAAyB;IACjD,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,OAAO,UAAU,KAAK,EAAE,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,IAAI,CAAC;AAClG,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,GAAuC;IACnF,MAAM,QAAQ,GAAG,GAAG,CAAC,kCAAkC,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC/E,IAAI,QAAQ,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACzC,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const JSON_RESULT_FIELDS = ["result", "response", "output", "message", "text"];
|
|
2
2
|
export function isJsonCliProvider(provider) {
|
|
3
|
-
return provider !== "codex";
|
|
3
|
+
return provider !== "codex" && provider !== "openclaw" && provider !== "opencode";
|
|
4
4
|
}
|
|
5
5
|
const parseJsonFromOutput = (output) => {
|
|
6
6
|
const trimmed = output.trim();
|
|
@@ -31,6 +31,13 @@ const toNumber = (value) => {
|
|
|
31
31
|
return null;
|
|
32
32
|
return value;
|
|
33
33
|
};
|
|
34
|
+
const sumNullable = (current, next) => {
|
|
35
|
+
if (typeof next !== "number")
|
|
36
|
+
return current;
|
|
37
|
+
if (typeof current !== "number")
|
|
38
|
+
return next;
|
|
39
|
+
return current + next;
|
|
40
|
+
};
|
|
34
41
|
const parseClaudeUsage = (payload) => {
|
|
35
42
|
const usage = payload.usage;
|
|
36
43
|
if (!usage || typeof usage !== "object")
|
|
@@ -144,6 +151,223 @@ export const parseCodexUsageFromJsonl = (output) => {
|
|
|
144
151
|
}
|
|
145
152
|
return { usage, costUsd };
|
|
146
153
|
};
|
|
154
|
+
function extractCodexTextFromContentBlocks(blocks) {
|
|
155
|
+
if (!Array.isArray(blocks))
|
|
156
|
+
return null;
|
|
157
|
+
const text = blocks
|
|
158
|
+
.flatMap((block) => {
|
|
159
|
+
if (!block || typeof block !== "object")
|
|
160
|
+
return [];
|
|
161
|
+
const record = block;
|
|
162
|
+
if (typeof record.text === "string" && record.text.trim().length > 0) {
|
|
163
|
+
return [record.text];
|
|
164
|
+
}
|
|
165
|
+
const nested = record.content;
|
|
166
|
+
if (!Array.isArray(nested))
|
|
167
|
+
return [];
|
|
168
|
+
return nested
|
|
169
|
+
.map((part) => {
|
|
170
|
+
if (!part || typeof part !== "object")
|
|
171
|
+
return "";
|
|
172
|
+
const partRecord = part;
|
|
173
|
+
return typeof partRecord.text === "string" ? partRecord.text : "";
|
|
174
|
+
})
|
|
175
|
+
.filter((part) => part.trim().length > 0);
|
|
176
|
+
})
|
|
177
|
+
.join("");
|
|
178
|
+
return text.trim().length > 0 ? text.trim() : null;
|
|
179
|
+
}
|
|
180
|
+
function extractCodexTextEvent(parsed) {
|
|
181
|
+
const type = typeof parsed.type === "string" ? parsed.type : "";
|
|
182
|
+
if (type === "response.output_text.delta" && typeof parsed.delta === "string") {
|
|
183
|
+
return { deltaText: parsed.delta, fullText: null };
|
|
184
|
+
}
|
|
185
|
+
if (type === "response.output_text.done") {
|
|
186
|
+
const text = typeof parsed.text === "string"
|
|
187
|
+
? parsed.text
|
|
188
|
+
: typeof parsed.delta === "string"
|
|
189
|
+
? parsed.delta
|
|
190
|
+
: null;
|
|
191
|
+
return { deltaText: null, fullText: text };
|
|
192
|
+
}
|
|
193
|
+
if (typeof parsed.output_text === "string" && parsed.output_text.trim().length > 0) {
|
|
194
|
+
return { deltaText: null, fullText: parsed.output_text.trim() };
|
|
195
|
+
}
|
|
196
|
+
const response = parsed.response;
|
|
197
|
+
if (response && typeof response === "object") {
|
|
198
|
+
const responseRecord = response;
|
|
199
|
+
if (typeof responseRecord.output_text === "string" &&
|
|
200
|
+
responseRecord.output_text.trim().length > 0) {
|
|
201
|
+
return { deltaText: null, fullText: responseRecord.output_text.trim() };
|
|
202
|
+
}
|
|
203
|
+
const responseOutput = extractCodexTextFromContentBlocks(responseRecord.output);
|
|
204
|
+
if (responseOutput) {
|
|
205
|
+
return { deltaText: null, fullText: responseOutput };
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
const message = parsed.message;
|
|
209
|
+
if (message && typeof message === "object") {
|
|
210
|
+
const messageOutput = extractCodexTextFromContentBlocks([message]);
|
|
211
|
+
if (messageOutput) {
|
|
212
|
+
return { deltaText: null, fullText: messageOutput };
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
const item = parsed.item;
|
|
216
|
+
if (item && typeof item === "object") {
|
|
217
|
+
const itemOutput = extractCodexTextFromContentBlocks([item]);
|
|
218
|
+
if (itemOutput) {
|
|
219
|
+
return { deltaText: null, fullText: itemOutput };
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
return { deltaText: null, fullText: null };
|
|
223
|
+
}
|
|
224
|
+
export function parseCodexOutputFromJsonl(output) {
|
|
225
|
+
const trimmed = output.trim();
|
|
226
|
+
if (!trimmed) {
|
|
227
|
+
return { text: null, sawStructuredEvent: false };
|
|
228
|
+
}
|
|
229
|
+
const lines = trimmed
|
|
230
|
+
.split(/\r?\n/)
|
|
231
|
+
.map((line) => line.trim())
|
|
232
|
+
.filter((line) => line.length > 0);
|
|
233
|
+
const deltaParts = [];
|
|
234
|
+
let fullText = null;
|
|
235
|
+
let sawStructuredEvent = false;
|
|
236
|
+
for (const line of lines) {
|
|
237
|
+
if (!line.startsWith("{"))
|
|
238
|
+
continue;
|
|
239
|
+
try {
|
|
240
|
+
const parsed = JSON.parse(line);
|
|
241
|
+
sawStructuredEvent = true;
|
|
242
|
+
const { deltaText, fullText: eventFullText } = extractCodexTextEvent(parsed);
|
|
243
|
+
if (typeof deltaText === "string" && deltaText.length > 0) {
|
|
244
|
+
deltaParts.push(deltaText);
|
|
245
|
+
continue;
|
|
246
|
+
}
|
|
247
|
+
if (!fullText && typeof eventFullText === "string" && eventFullText.length > 0) {
|
|
248
|
+
fullText = eventFullText;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
catch {
|
|
252
|
+
// ignore malformed JSON lines
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
const deltaText = deltaParts.join("").trim();
|
|
256
|
+
if (deltaText)
|
|
257
|
+
return { text: deltaText, sawStructuredEvent };
|
|
258
|
+
if (fullText)
|
|
259
|
+
return { text: fullText, sawStructuredEvent };
|
|
260
|
+
return { text: null, sawStructuredEvent };
|
|
261
|
+
}
|
|
262
|
+
function parseOpenCodeTokens(payload) {
|
|
263
|
+
const tokens = payload.tokens;
|
|
264
|
+
if (!tokens || typeof tokens !== "object")
|
|
265
|
+
return null;
|
|
266
|
+
const record = tokens;
|
|
267
|
+
const promptTokens = toNumber(record.input);
|
|
268
|
+
const completionTokens = toNumber(record.output);
|
|
269
|
+
const totalTokens = toNumber(record.total) ??
|
|
270
|
+
(typeof promptTokens === "number" && typeof completionTokens === "number"
|
|
271
|
+
? promptTokens + completionTokens
|
|
272
|
+
: null);
|
|
273
|
+
if (promptTokens === null && completionTokens === null && totalTokens === null)
|
|
274
|
+
return null;
|
|
275
|
+
return { promptTokens, completionTokens, totalTokens };
|
|
276
|
+
}
|
|
277
|
+
function extractOpenCodeErrorMessage(payload) {
|
|
278
|
+
const error = payload.error;
|
|
279
|
+
if (!error)
|
|
280
|
+
return null;
|
|
281
|
+
if (typeof error === "string" && error.trim().length > 0)
|
|
282
|
+
return error.trim();
|
|
283
|
+
if (typeof error !== "object")
|
|
284
|
+
return null;
|
|
285
|
+
const errorRecord = error;
|
|
286
|
+
const data = errorRecord.data;
|
|
287
|
+
if (data && typeof data === "object") {
|
|
288
|
+
const message = data.message;
|
|
289
|
+
if (typeof message === "string" && message.trim().length > 0)
|
|
290
|
+
return message.trim();
|
|
291
|
+
}
|
|
292
|
+
const message = errorRecord.message;
|
|
293
|
+
if (typeof message === "string" && message.trim().length > 0)
|
|
294
|
+
return message.trim();
|
|
295
|
+
const name = errorRecord.name;
|
|
296
|
+
return typeof name === "string" && name.trim().length > 0 ? name.trim() : null;
|
|
297
|
+
}
|
|
298
|
+
export function parseOpenCodeOutputFromJsonl(output) {
|
|
299
|
+
const trimmed = output.trim();
|
|
300
|
+
if (!trimmed) {
|
|
301
|
+
throw new Error("CLI returned empty output");
|
|
302
|
+
}
|
|
303
|
+
const lines = trimmed
|
|
304
|
+
.split(/\r?\n/)
|
|
305
|
+
.map((line) => line.trim())
|
|
306
|
+
.filter((line) => line.length > 0);
|
|
307
|
+
const textParts = [];
|
|
308
|
+
const errorMessages = [];
|
|
309
|
+
let promptTokens = null;
|
|
310
|
+
let completionTokens = null;
|
|
311
|
+
let totalTokens = null;
|
|
312
|
+
let costUsd = null;
|
|
313
|
+
let sawStructuredEvent = false;
|
|
314
|
+
for (const line of lines) {
|
|
315
|
+
if (!line.startsWith("{"))
|
|
316
|
+
continue;
|
|
317
|
+
try {
|
|
318
|
+
const parsed = JSON.parse(line);
|
|
319
|
+
sawStructuredEvent = true;
|
|
320
|
+
if (parsed.type === "text") {
|
|
321
|
+
const part = parsed.part;
|
|
322
|
+
if (part && typeof part === "object") {
|
|
323
|
+
const text = part.text;
|
|
324
|
+
if (typeof text === "string" && text.length > 0) {
|
|
325
|
+
textParts.push(text);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
continue;
|
|
329
|
+
}
|
|
330
|
+
if (parsed.type === "step_finish") {
|
|
331
|
+
const part = parsed.part;
|
|
332
|
+
if (!part || typeof part !== "object")
|
|
333
|
+
continue;
|
|
334
|
+
const usage = parseOpenCodeTokens(part);
|
|
335
|
+
if (usage) {
|
|
336
|
+
promptTokens = sumNullable(promptTokens, usage.promptTokens);
|
|
337
|
+
completionTokens = sumNullable(completionTokens, usage.completionTokens);
|
|
338
|
+
totalTokens = sumNullable(totalTokens, usage.totalTokens);
|
|
339
|
+
}
|
|
340
|
+
const cost = toNumber(part.cost);
|
|
341
|
+
if (typeof cost === "number") {
|
|
342
|
+
costUsd = typeof costUsd === "number" ? costUsd + cost : cost;
|
|
343
|
+
}
|
|
344
|
+
continue;
|
|
345
|
+
}
|
|
346
|
+
if (parsed.type === "error") {
|
|
347
|
+
const message = extractOpenCodeErrorMessage(parsed);
|
|
348
|
+
if (message)
|
|
349
|
+
errorMessages.push(message);
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
catch {
|
|
353
|
+
// ignore malformed JSON lines
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
const text = textParts.join("").trim();
|
|
357
|
+
const usage = promptTokens !== null || completionTokens !== null || totalTokens !== null
|
|
358
|
+
? { promptTokens, completionTokens, totalTokens }
|
|
359
|
+
: null;
|
|
360
|
+
if (text) {
|
|
361
|
+
return { text, usage, costUsd };
|
|
362
|
+
}
|
|
363
|
+
if (errorMessages.length > 0) {
|
|
364
|
+
throw new Error(errorMessages.join("\n"));
|
|
365
|
+
}
|
|
366
|
+
if (sawStructuredEvent) {
|
|
367
|
+
throw new Error("CLI returned empty output");
|
|
368
|
+
}
|
|
369
|
+
return { text: trimmed, usage: null, costUsd: null };
|
|
370
|
+
}
|
|
147
371
|
function extractJsonResultText(payload) {
|
|
148
372
|
for (const key of JSON_RESULT_FIELDS) {
|
|
149
373
|
const value = payload[key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-provider-output.js","sourceRoot":"","sources":["../../../src/llm/cli-provider-output.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli-provider-output.js","sourceRoot":"","sources":["../../../src/llm/cli-provider-output.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/llm/cli.js
CHANGED
|
@@ -3,18 +3,22 @@ import fs from "node:fs/promises";
|
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { execCliWithInput } from "./cli-exec.js";
|
|
6
|
-
import { isJsonCliProvider, parseCodexUsageFromJsonl, parseJsonProviderOutput, } from "./cli-provider-output.js";
|
|
6
|
+
import { parseCodexOutputFromJsonl, isJsonCliProvider, parseCodexUsageFromJsonl, parseOpenCodeOutputFromJsonl, parseJsonProviderOutput, } from "./cli-provider-output.js";
|
|
7
7
|
const DEFAULT_BINARIES = {
|
|
8
8
|
claude: "claude",
|
|
9
9
|
codex: "codex",
|
|
10
10
|
gemini: "gemini",
|
|
11
11
|
agent: "agent",
|
|
12
|
+
openclaw: "openclaw",
|
|
13
|
+
opencode: "opencode",
|
|
12
14
|
};
|
|
13
15
|
const PROVIDER_PATH_ENV = {
|
|
14
16
|
claude: "CLAUDE_PATH",
|
|
15
17
|
codex: "CODEX_PATH",
|
|
16
18
|
gemini: "GEMINI_PATH",
|
|
17
19
|
agent: "AGENT_PATH",
|
|
20
|
+
openclaw: "OPENCLAW_PATH",
|
|
21
|
+
opencode: "OPENCODE_PATH",
|
|
18
22
|
};
|
|
19
23
|
const isNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
|
|
20
24
|
function getCliProviderConfig(provider, config) {
|
|
@@ -26,7 +30,11 @@ function getCliProviderConfig(provider, config) {
|
|
|
26
30
|
return config.codex;
|
|
27
31
|
if (provider === "gemini")
|
|
28
32
|
return config.gemini;
|
|
29
|
-
|
|
33
|
+
if (provider === "agent")
|
|
34
|
+
return config.agent;
|
|
35
|
+
if (provider === "openclaw")
|
|
36
|
+
return config.openclaw;
|
|
37
|
+
return config.opencode;
|
|
30
38
|
}
|
|
31
39
|
export function isCliDisabled(provider, config) {
|
|
32
40
|
if (!config)
|
|
@@ -84,18 +92,84 @@ export async function runCliModel({ provider, prompt, model, allowTools, timeout
|
|
|
84
92
|
? { ...env, GEMINI_CLI_NO_RELAUNCH: "true" }
|
|
85
93
|
: env;
|
|
86
94
|
const providerConfig = getCliProviderConfig(provider, config);
|
|
95
|
+
const requestedModel = isNonEmptyString(model)
|
|
96
|
+
? model.trim()
|
|
97
|
+
: isNonEmptyString(providerConfig?.model)
|
|
98
|
+
? providerConfig.model.trim()
|
|
99
|
+
: null;
|
|
100
|
+
const providerExtraArgs = [];
|
|
87
101
|
if (providerConfig?.extraArgs?.length) {
|
|
88
|
-
|
|
102
|
+
providerExtraArgs.push(...providerConfig.extraArgs);
|
|
89
103
|
}
|
|
90
104
|
if (extraArgs?.length) {
|
|
91
|
-
|
|
105
|
+
providerExtraArgs.push(...extraArgs);
|
|
106
|
+
}
|
|
107
|
+
if (provider === "openclaw") {
|
|
108
|
+
const openclawArgs = [
|
|
109
|
+
...providerExtraArgs,
|
|
110
|
+
"agent",
|
|
111
|
+
"--agent",
|
|
112
|
+
requestedModel ?? "main",
|
|
113
|
+
"-",
|
|
114
|
+
"--json",
|
|
115
|
+
"--timeout",
|
|
116
|
+
String(Math.max(1, Math.ceil(timeoutMs / 1000))),
|
|
117
|
+
];
|
|
118
|
+
const { stdout } = await execCliWithInput({
|
|
119
|
+
execFileImpl: execFileFn,
|
|
120
|
+
cmd: binary,
|
|
121
|
+
args: openclawArgs,
|
|
122
|
+
input: prompt,
|
|
123
|
+
timeoutMs,
|
|
124
|
+
env: effectiveEnv,
|
|
125
|
+
cwd,
|
|
126
|
+
});
|
|
127
|
+
const parsed = JSON.parse(stdout);
|
|
128
|
+
const payloads = parsed?.result?.payloads;
|
|
129
|
+
const text = Array.isArray(payloads)
|
|
130
|
+
? payloads
|
|
131
|
+
.map((p) => (typeof p?.text === "string" ? p.text : ""))
|
|
132
|
+
.filter(Boolean)
|
|
133
|
+
.join("\n\n")
|
|
134
|
+
: "";
|
|
135
|
+
if (!text.trim())
|
|
136
|
+
throw new Error("OpenClaw CLI returned empty output");
|
|
137
|
+
const usage = parsed?.result?.meta?.agentMeta?.lastCallUsage ??
|
|
138
|
+
parsed?.result?.meta?.agentMeta?.usage ??
|
|
139
|
+
null;
|
|
140
|
+
return { text: text.trim(), usage, costUsd: null };
|
|
141
|
+
}
|
|
142
|
+
if (provider === "opencode") {
|
|
143
|
+
const isolatedCwd = !allowTools && !cwd ? await fs.mkdtemp(path.join(tmpdir(), "summarize-opencode-")) : null;
|
|
144
|
+
try {
|
|
145
|
+
args.push("run", ...providerExtraArgs, "--format", "json");
|
|
146
|
+
if (requestedModel) {
|
|
147
|
+
args.push("--model", requestedModel);
|
|
148
|
+
}
|
|
149
|
+
const { stdout } = await execCliWithInput({
|
|
150
|
+
execFileImpl: execFileFn,
|
|
151
|
+
cmd: binary,
|
|
152
|
+
args,
|
|
153
|
+
input: prompt,
|
|
154
|
+
timeoutMs,
|
|
155
|
+
env: effectiveEnv,
|
|
156
|
+
cwd: isolatedCwd ?? cwd,
|
|
157
|
+
});
|
|
158
|
+
return parseOpenCodeOutputFromJsonl(stdout);
|
|
159
|
+
}
|
|
160
|
+
finally {
|
|
161
|
+
if (isolatedCwd) {
|
|
162
|
+
await fs.rm(isolatedCwd, { recursive: true, force: true }).catch(() => { });
|
|
163
|
+
}
|
|
164
|
+
}
|
|
92
165
|
}
|
|
93
166
|
if (provider === "codex") {
|
|
94
167
|
const outputDir = await fs.mkdtemp(path.join(tmpdir(), "summarize-codex-"));
|
|
95
168
|
const outputPath = path.join(outputDir, "last-message.txt");
|
|
169
|
+
args.push(...providerExtraArgs);
|
|
96
170
|
args.push("exec", "--output-last-message", outputPath, "--skip-git-repo-check", "--json");
|
|
97
|
-
if (
|
|
98
|
-
args.push("-m",
|
|
171
|
+
if (requestedModel) {
|
|
172
|
+
args.push("-m", requestedModel);
|
|
99
173
|
}
|
|
100
174
|
const hasVerbosityOverride = args.some((arg) => arg.includes("text.verbosity"));
|
|
101
175
|
if (!hasVerbosityOverride) {
|
|
@@ -121,6 +195,13 @@ export async function runCliModel({ provider, prompt, model, allowTools, timeout
|
|
|
121
195
|
if (fileText) {
|
|
122
196
|
return { text: fileText, usage, costUsd };
|
|
123
197
|
}
|
|
198
|
+
const parsedStdout = parseCodexOutputFromJsonl(stdout);
|
|
199
|
+
if (parsedStdout.text) {
|
|
200
|
+
return { text: parsedStdout.text, usage, costUsd };
|
|
201
|
+
}
|
|
202
|
+
if (parsedStdout.sawStructuredEvent) {
|
|
203
|
+
throw new Error("CLI returned empty output");
|
|
204
|
+
}
|
|
124
205
|
const stdoutText = stdout.trim();
|
|
125
206
|
if (stdoutText) {
|
|
126
207
|
return { text: stdoutText, usage, costUsd };
|
|
@@ -130,7 +211,14 @@ export async function runCliModel({ provider, prompt, model, allowTools, timeout
|
|
|
130
211
|
if (!isJsonCliProvider(provider)) {
|
|
131
212
|
throw new Error(`Unsupported CLI provider "${provider}".`);
|
|
132
213
|
}
|
|
133
|
-
|
|
214
|
+
args.push(...providerExtraArgs);
|
|
215
|
+
const input = appendJsonProviderArgs({
|
|
216
|
+
provider,
|
|
217
|
+
args,
|
|
218
|
+
allowTools,
|
|
219
|
+
model: requestedModel,
|
|
220
|
+
prompt,
|
|
221
|
+
});
|
|
134
222
|
const { stdout } = await execCliWithInput({
|
|
135
223
|
execFileImpl: execFileFn,
|
|
136
224
|
cmd: binary,
|
package/dist/esm/llm/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/llm/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,uBAAuB,GAExB,MAAM,0BAA0B,CAAC;AAGlC,MAAM,gBAAgB,GAAgC;IACpD,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/llm/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-text-document.js","sourceRoot":"","sources":["../../../src/llm/generate-text-document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mCAAmC,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EACL,yBAAyB,EACzB,yCAAyC,GAC1C,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-text-document.js","sourceRoot":"","sources":["../../../src/llm/generate-text-document.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,16 +68,35 @@ export function streamUsageWithTimeout({ result, timeoutMs, }) {
|
|
|
68
68
|
fallback: null,
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
|
-
function
|
|
72
|
-
|
|
71
|
+
export function isOpenAiGpt5Model(provider, model) {
|
|
72
|
+
const normalized = model
|
|
73
|
+
.trim()
|
|
74
|
+
.toLowerCase()
|
|
75
|
+
.replace(/^openai\//, "");
|
|
76
|
+
return ((provider === "openai" && /^gpt-5([-.].+)?$/i.test(normalized)) ||
|
|
77
|
+
(provider === "github-copilot" && /^openai\/gpt-5([-.].+)?$/i.test(model)));
|
|
73
78
|
}
|
|
74
79
|
export function resolveEffectiveTemperature({ provider, model, temperature, }) {
|
|
75
80
|
if (typeof temperature !== "number")
|
|
76
81
|
return undefined;
|
|
77
|
-
if (
|
|
82
|
+
if (isOpenAiGpt5Model(provider, model))
|
|
78
83
|
return undefined;
|
|
79
84
|
return temperature;
|
|
80
85
|
}
|
|
86
|
+
export function shouldRetryGpt5WithoutTokenCap({ provider, model, maxOutputTokens, error, }) {
|
|
87
|
+
if (typeof maxOutputTokens !== "number")
|
|
88
|
+
return false;
|
|
89
|
+
if (!isOpenAiGpt5Model(provider, model))
|
|
90
|
+
return false;
|
|
91
|
+
const message = error instanceof Error
|
|
92
|
+
? error.message
|
|
93
|
+
: typeof error === "string"
|
|
94
|
+
? error
|
|
95
|
+
: typeof error?.message === "string"
|
|
96
|
+
? String(error.message)
|
|
97
|
+
: "";
|
|
98
|
+
return /empty summary/i.test(message);
|
|
99
|
+
}
|
|
81
100
|
export function resolveGoogleEmptyResponseFallbackModelId(modelId) {
|
|
82
101
|
const normalized = modelId.trim().toLowerCase();
|
|
83
102
|
if (!normalized.startsWith("google/"))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-text-shared.js","sourceRoot":"","sources":["../../../src/llm/generate-text-shared.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate-text-shared.js","sourceRoot":"","sources":["../../../src/llm/generate-text-shared.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;IAC7C,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO;YACL,YAAY,EAAE,MAAM,CAAC,MAAM;YAC3B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;SAC9E,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;IAC9F,CAAC;IACD,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAc;QAC1B,uBAAuB,CAAC;YACtB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,UAAU,EAAE,UAAU,CAAC,KAAK;YAC5B,QAAQ,EAAE,UAAU,CAAC,SAAS;SAC/B,CAAC;KACH,CAAC;IACF,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,MAAM,OAAO,GACX,OAAO,KAAK,KAAK,QAAQ;QACvB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,KAAK,YAAY,KAAK;YACtB,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,OAAQ,KAA+B,CAAC,OAAO,KAAK,QAAQ;gBAC5D,CAAC,CAAC,MAAM,CAAE,KAA+B,CAAC,OAAO,CAAC;gBAClD,CAAC,CAAC,EAAE,CAAC;IACb,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,MAAM,IAAI,GAAG,GAAG,CAAC;IACjB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;IAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAI,EAC3C,OAAO,EACP,SAAS,EACT,QAAQ,GAKT;IACC,MAAM,kBAAkB,GACtB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/E,IAAI,KAAK,GAAyC,IAAI,CAAC;IACvD,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC;YACxB,OAAO;YACP,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE;gBACzB,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,kBAAkB,CAAC,CAAC;YAClE,CAAC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACrC,MAAM,EACN,SAAS,GAIV;IACC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1F,OAAO,mBAAmB,CAAC;QACzB,OAAO,EAAE,UAAU;QACnB,SAAS;QACT,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,KAAa;IAC/D,MAAM,UAAU,GAAG,KAAK;SACrB,IAAI,EAAE;SACN,WAAW,EAAE;SACb,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5B,OAAO,CACL,CAAC,QAAQ,KAAK,QAAQ,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC,QAAQ,KAAK,gBAAgB,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,EAC1C,QAAQ,EACR,KAAK,EACL,WAAW,GAKZ;IACC,IAAI,OAAO,WAAW,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACtD,IAAI,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,EAC7C,QAAQ,EACR,KAAK,EACL,eAAe,EACf,KAAK,GAMN;IACC,IAAI,OAAO,eAAe,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,OAAO,GACX,KAAK,YAAY,KAAK;QACpB,CAAC,CAAC,KAAK,CAAC,OAAO;QACf,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAQ,KAA+B,EAAE,OAAO,KAAK,QAAQ;gBAC7D,CAAC,CAAC,MAAM,CAAE,KAA+B,CAAC,OAAO,CAAC;gBAClD,CAAC,CAAC,EAAE,CAAC;IACb,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,yCAAyC,CAAC,OAAe;IACvE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IACnD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAClE,IAAI,GAAG,KAAK,kBAAkB;QAAE,OAAO,IAAI,CAAC;IAC5C,OAAO,yBAAyB,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,MAAM,OAAO,GACX,KAAK,YAAY,KAAK;QACpB,CAAC,CAAC,KAAK,CAAC,OAAO;QACf,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAQ,KAA+B,EAAE,OAAO,KAAK,QAAQ;gBAC7D,CAAC,CAAC,MAAM,CAAE,KAA+B,CAAC,OAAO,CAAC;gBAClD,CAAC,CAAC,EAAE,CAAC;IACb,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { parseGatewayStyleModelId } from "./model-id.js";
|
|
|
5
5
|
import { resolveOpenAiCompatibleClientConfigForProvider, supportsStreaming, } from "./provider-capabilities.js";
|
|
6
6
|
import { normalizeAnthropicModelAccessError } from "./providers/anthropic.js";
|
|
7
7
|
import { resolveAnthropicModel, resolveGoogleModel, resolveOpenAiModel, resolveXaiModel, } from "./providers/models.js";
|
|
8
|
+
import { completeOpenAiText } from "./providers/openai.js";
|
|
8
9
|
function createTimedTextStream({ textStream, timeoutMs, controller, setLastError, }) {
|
|
9
10
|
let timeoutId = null;
|
|
10
11
|
const startedAtMs = Date.now();
|
|
@@ -207,7 +208,10 @@ export async function streamTextWithContext({ modelId, apiKeys, context, tempera
|
|
|
207
208
|
lastError: () => lastError,
|
|
208
209
|
};
|
|
209
210
|
}
|
|
210
|
-
if (parsed.provider === "openai" ||
|
|
211
|
+
if (parsed.provider === "openai" ||
|
|
212
|
+
parsed.provider === "zai" ||
|
|
213
|
+
parsed.provider === "nvidia" ||
|
|
214
|
+
parsed.provider === "github-copilot") {
|
|
211
215
|
const openaiConfig = resolveOpenAiCompatibleClientConfigForProvider({
|
|
212
216
|
provider: parsed.provider,
|
|
213
217
|
openaiApiKey: apiKeys.openaiApiKey,
|
|
@@ -216,6 +220,35 @@ export async function streamTextWithContext({ modelId, apiKeys, context, tempera
|
|
|
216
220
|
openaiBaseUrlOverride,
|
|
217
221
|
forceChatCompletions,
|
|
218
222
|
});
|
|
223
|
+
if (parsed.provider === "github-copilot") {
|
|
224
|
+
const result = await completeOpenAiText({
|
|
225
|
+
modelId: parsed.model,
|
|
226
|
+
openaiConfig,
|
|
227
|
+
context,
|
|
228
|
+
temperature: effectiveTemperature,
|
|
229
|
+
maxOutputTokens,
|
|
230
|
+
signal: controller.signal,
|
|
231
|
+
fetchImpl,
|
|
232
|
+
});
|
|
233
|
+
return {
|
|
234
|
+
textStream: createTimedTextStream({
|
|
235
|
+
textStream: {
|
|
236
|
+
async *[Symbol.asyncIterator]() {
|
|
237
|
+
yield result.text;
|
|
238
|
+
},
|
|
239
|
+
},
|
|
240
|
+
timeoutMs,
|
|
241
|
+
controller,
|
|
242
|
+
setLastError,
|
|
243
|
+
}),
|
|
244
|
+
canonicalModelId: result.resolvedModelId
|
|
245
|
+
? `${parsed.provider}/${result.resolvedModelId}`
|
|
246
|
+
: parsed.canonical,
|
|
247
|
+
provider: parsed.provider,
|
|
248
|
+
usage: Promise.resolve(result.usage),
|
|
249
|
+
lastError: () => lastError,
|
|
250
|
+
};
|
|
251
|
+
}
|
|
219
252
|
const model = resolveOpenAiModel({ modelId: parsed.model, context, openaiConfig });
|
|
220
253
|
const stream = streamSimple(model, context, {
|
|
221
254
|
...(typeof effectiveTemperature === "number" ? { temperature: effectiveTemperature } : {}),
|