@pentoshi/clai 5.1.3 → 5.1.5
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 +66 -0
- package/MCP.md +1 -1
- package/README.md +2 -0
- package/dist/agent/context/compaction-recent-history.js +1 -3
- package/dist/agent/context/compaction-recent-history.js.map +1 -1
- package/dist/agent/goal/goal-evaluator.d.ts +22 -0
- package/dist/agent/goal/goal-evaluator.js +146 -0
- package/dist/agent/goal/goal-evaluator.js.map +1 -0
- package/dist/agent/goal/goal-failure.d.ts +7 -0
- package/dist/agent/goal/goal-failure.js +41 -0
- package/dist/agent/goal/goal-failure.js.map +1 -0
- package/dist/agent/goal/goal-prompts.d.ts +14 -0
- package/dist/agent/goal/goal-prompts.js +107 -0
- package/dist/agent/goal/goal-prompts.js.map +1 -0
- package/dist/agent/goal/goal-verdict.d.ts +7 -0
- package/dist/agent/goal/goal-verdict.js +99 -0
- package/dist/agent/goal/goal-verdict.js.map +1 -0
- package/dist/agent/runner.js +6 -0
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/tool-output-formatting.d.ts +1 -1
- package/dist/agent/tool-output-formatting.js +10 -6
- package/dist/agent/tool-output-formatting.js.map +1 -1
- package/dist/agent/turn/compaction-coordinator.js +2 -3
- package/dist/agent/turn/compaction-coordinator.js.map +1 -1
- package/dist/agent/turn/finalizer.d.ts +1 -0
- package/dist/agent/turn/finalizer.js +2 -0
- package/dist/agent/turn/finalizer.js.map +1 -1
- package/dist/agent/turn/mcp-agent-tools.js +1 -1
- package/dist/agent/turn/mcp-agent-tools.js.map +1 -1
- package/dist/agent/turn/responder-claims.d.ts +3 -0
- package/dist/agent/turn/responder-claims.js +35 -0
- package/dist/agent/turn/responder-claims.js.map +1 -1
- package/dist/agent/turn/responder-read-tool.js +4 -10
- package/dist/agent/turn/responder-read-tool.js.map +1 -1
- package/dist/app/adapters/current-store-adapter.js +3 -0
- package/dist/app/adapters/current-store-adapter.js.map +1 -1
- package/dist/app/commands/catalog.js +6 -0
- package/dist/app/commands/catalog.js.map +1 -1
- package/dist/app/controllers/cancel-coordinator.d.ts +3 -0
- package/dist/app/controllers/cancel-coordinator.js +8 -3
- package/dist/app/controllers/cancel-coordinator.js.map +1 -1
- package/dist/app/controllers/goal-types.d.ts +47 -0
- package/dist/app/controllers/goal-types.js +2 -0
- package/dist/app/controllers/goal-types.js.map +1 -0
- package/dist/app/controllers/session-compact-helper.d.ts +1 -0
- package/dist/app/controllers/session-compact-helper.js +24 -1
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/controllers/session-controller.d.ts +16 -0
- package/dist/app/controllers/session-controller.js +157 -8
- package/dist/app/controllers/session-controller.js.map +1 -1
- package/dist/app/controllers/session-goal.d.ts +93 -0
- package/dist/app/controllers/session-goal.js +556 -0
- package/dist/app/controllers/session-goal.js.map +1 -0
- package/dist/app/controllers/session-responder.d.ts +1 -0
- package/dist/app/controllers/session-responder.js +7 -4
- package/dist/app/controllers/session-responder.js.map +1 -1
- package/dist/app/controllers/turn-controller.js +14 -5
- package/dist/app/controllers/turn-controller.js.map +1 -1
- package/dist/app/events/app-event.d.ts +2 -0
- package/dist/app/events/app-event.js.map +1 -1
- package/dist/app/ports/persistence-port.d.ts +13 -0
- package/dist/classic/app/ClassicApp.js +4 -0
- package/dist/classic/app/ClassicApp.js.map +1 -1
- package/dist/classic/app/app-wiring.js +1 -1
- package/dist/classic/app/app-wiring.js.map +1 -1
- package/dist/classic/app/paint-pacing.js +1 -5
- package/dist/classic/app/paint-pacing.js.map +1 -1
- package/dist/classic/app/wiring-feed-scroll.d.ts +1 -1
- package/dist/classic/app/wiring-feed-scroll.js +3 -6
- package/dist/classic/app/wiring-feed-scroll.js.map +1 -1
- package/dist/classic/app/wiring-interactions.js +1 -0
- package/dist/classic/app/wiring-interactions.js.map +1 -1
- package/dist/classic/app/wiring-lifecycle.js +2 -4
- package/dist/classic/app/wiring-lifecycle.js.map +1 -1
- package/dist/classic/app/wiring-selection.js +1 -1
- package/dist/classic/app/wiring-selection.js.map +1 -1
- package/dist/classic/blocks/notice-lines.js +17 -3
- package/dist/classic/blocks/notice-lines.js.map +1 -1
- package/dist/classic/blocks/turn-summary-lines.js +2 -3
- package/dist/classic/blocks/turn-summary-lines.js.map +1 -1
- package/dist/classic/chrome/Chrome.d.ts +1 -1
- package/dist/classic/chrome/Chrome.js +1 -0
- package/dist/classic/chrome/Chrome.js.map +1 -1
- package/dist/classic/chrome/GoalStrip.d.ts +3 -0
- package/dist/classic/chrome/GoalStrip.js +9 -0
- package/dist/classic/chrome/GoalStrip.js.map +1 -0
- package/dist/classic/chrome/composer-controller.js +5 -2
- package/dist/classic/chrome/composer-controller.js.map +1 -1
- package/dist/classic/chrome/editor-view.js +4 -1
- package/dist/classic/chrome/editor-view.js.map +1 -1
- package/dist/classic/chrome/goal-row.d.ts +11 -0
- package/dist/classic/chrome/goal-row.js +24 -0
- package/dist/classic/chrome/goal-row.js.map +1 -0
- package/dist/classic/chrome/row-budget.d.ts +2 -0
- package/dist/classic/chrome/row-budget.js +4 -1
- package/dist/classic/chrome/row-budget.js.map +1 -1
- package/dist/classic/input/paste-burst.d.ts +4 -1
- package/dist/classic/input/paste-burst.js +9 -2
- package/dist/classic/input/paste-burst.js.map +1 -1
- package/dist/classic/panels/panel-effect.d.ts +4 -0
- package/dist/classic/panels/panel-effect.js.map +1 -1
- package/dist/classic/panels/panel-effects.js +3 -0
- package/dist/classic/panels/panel-effects.js.map +1 -1
- package/dist/classic/panels/picker-panel.js +12 -4
- package/dist/classic/panels/picker-panel.js.map +1 -1
- package/dist/llm/capabilities.js +38 -2
- package/dist/llm/capabilities.js.map +1 -1
- package/dist/llm/capability/vision-patterns.js +7 -1
- package/dist/llm/capability/vision-patterns.js.map +1 -1
- package/dist/llm/catalog-facts.js +3 -1
- package/dist/llm/catalog-facts.js.map +1 -1
- package/dist/llm/context-windows.js +1 -1
- package/dist/llm/context-windows.js.map +1 -1
- package/dist/llm/meta-effort.d.ts +1 -1
- package/dist/llm/meta-effort.js +13 -15
- package/dist/llm/meta-effort.js.map +1 -1
- package/dist/llm/meta-models.d.ts +3 -0
- package/dist/llm/meta-models.js +32 -0
- package/dist/llm/meta-models.js.map +1 -0
- package/dist/llm/meta.js +25 -19
- package/dist/llm/meta.js.map +1 -1
- package/dist/llm/provider-info-text.js +7 -2
- package/dist/llm/provider-info-text.js.map +1 -1
- package/dist/llm/provider-model-layers.js +30 -0
- package/dist/llm/provider-model-layers.js.map +1 -1
- package/dist/llm/provider-profiles.js +5 -4
- package/dist/llm/provider-profiles.js.map +1 -1
- package/dist/llm/request-plan.js +3 -1
- package/dist/llm/request-plan.js.map +1 -1
- package/dist/llm/responses-request.js +1 -1
- package/dist/llm/responses-request.js.map +1 -1
- package/dist/llm/river-docs.d.ts +18 -0
- package/dist/llm/river-docs.js +170 -0
- package/dist/llm/river-docs.js.map +1 -0
- package/dist/llm/river-models.d.ts +2 -1
- package/dist/llm/river-models.js +78 -13
- package/dist/llm/river-models.js.map +1 -1
- package/dist/llm/river.js +9 -6
- package/dist/llm/river.js.map +1 -1
- package/dist/llm/wire/effort-preflight.js +3 -1
- package/dist/llm/wire/effort-preflight.js.map +1 -1
- package/dist/llm/wire/model-catalog.d.ts +2 -0
- package/dist/llm/wire/model-catalog.js +5 -1
- package/dist/llm/wire/model-catalog.js.map +1 -1
- package/dist/llm/wire/reasoning-payload.js +4 -4
- package/dist/llm/wire/reasoning-payload.js.map +1 -1
- package/dist/os/sgr-state.d.ts +3 -0
- package/dist/os/sgr-state.js +80 -0
- package/dist/os/sgr-state.js.map +1 -0
- package/dist/os/terminal-sgr-compactor.d.ts +17 -0
- package/dist/os/terminal-sgr-compactor.js +164 -0
- package/dist/os/terminal-sgr-compactor.js.map +1 -0
- package/dist/prompts/embedded.js +2 -2
- package/dist/prompts/embedded.js.map +1 -1
- package/dist/prompts/system.agent.md +3 -3
- package/dist/prompts/system.ask.md +1 -1
- package/dist/session-runtime/client.js +7 -2
- package/dist/session-runtime/client.js.map +1 -1
- package/dist/store/config/endpoints.d.ts +1 -0
- package/dist/store/config/endpoints.js +2 -0
- package/dist/store/config/endpoints.js.map +1 -1
- package/dist/store/config/settings.d.ts +1 -0
- package/dist/store/config/settings.js +4 -0
- package/dist/store/config/settings.js.map +1 -1
- package/dist/store/session-goal.d.ts +4 -0
- package/dist/store/session-goal.js +75 -0
- package/dist/store/session-goal.js.map +1 -0
- package/dist/store/subagents.js +1 -1
- package/dist/store/subagents.js.map +1 -1
- package/dist/tools/definitions/web-1.js +1 -1
- package/dist/tools/definitions/web-1.js.map +1 -1
- package/dist/tools/shell/artifact.d.ts +1 -1
- package/dist/tools/shell/artifact.js +3 -0
- package/dist/tools/shell/artifact.js.map +1 -1
- package/dist/tui-v2/app/App.js +14 -5
- package/dist/tui-v2/app/App.js.map +1 -1
- package/dist/tui-v2/bootstrap/runtime-view.js +3 -1
- package/dist/tui-v2/bootstrap/runtime-view.js.map +1 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js +3 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
- package/dist/tui-v2/components/goal/goal-panel.d.ts +11 -0
- package/dist/tui-v2/components/goal/goal-panel.js +54 -0
- package/dist/tui-v2/components/goal/goal-panel.js.map +1 -0
- package/dist/tui-v2/components/jobs/jobs-panel.js +7 -8
- package/dist/tui-v2/components/jobs/jobs-panel.js.map +1 -1
- package/dist/tui-v2/components/pager/pager.js +8 -2
- package/dist/tui-v2/components/pager/pager.js.map +1 -1
- package/dist/tui-v2/components/picker/picker.js +39 -28
- package/dist/tui-v2/components/picker/picker.js.map +1 -1
- package/dist/tui-v2/components/plan/plan-view.d.ts +1 -0
- package/dist/tui-v2/components/plan/plan-view.js +6 -14
- package/dist/tui-v2/components/plan/plan-view.js.map +1 -1
- package/dist/tui-v2/components/status/status-line.js +4 -4
- package/dist/tui-v2/components/status/status-line.js.map +1 -1
- package/dist/tui-v2/components/transcript/notice-row.js +11 -9
- package/dist/tui-v2/components/transcript/notice-row.js.map +1 -1
- package/dist/tui-v2/components/transcript/tool-card.d.ts +0 -4
- package/dist/tui-v2/components/transcript/tool-card.js +29 -27
- package/dist/tui-v2/components/transcript/tool-card.js.map +1 -1
- package/dist/tui-v2/components/transcript/tool-output-branch.d.ts +8 -0
- package/dist/tui-v2/components/transcript/tool-output-branch.js +22 -0
- package/dist/tui-v2/components/transcript/tool-output-branch.js.map +1 -0
- package/dist/tui-v2/components/transcript/transcript-row.js +2 -2
- package/dist/tui-v2/components/transcript/transcript-row.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-scroll-port.d.ts +6 -1
- package/dist/tui-v2/components/transcript/transcript-scroll-port.js +40 -27
- package/dist/tui-v2/components/transcript/transcript-scroll-port.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-view.js +2 -2
- package/dist/tui-v2/components/transcript/transcript-view.js.map +1 -1
- package/dist/tui-v2/composer/composer-editor.js +2 -1
- package/dist/tui-v2/composer/composer-editor.js.map +1 -1
- package/dist/tui-v2/composer/composer-highlight.d.ts +2 -1
- package/dist/tui-v2/composer/composer-highlight.js +25 -3
- package/dist/tui-v2/composer/composer-highlight.js.map +1 -1
- package/dist/tui-v2/input/paste-burst-guard.d.ts +1 -0
- package/dist/tui-v2/input/paste-burst-guard.js +3 -1
- package/dist/tui-v2/input/paste-burst-guard.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/ui-core/commands/command-handlers.js +4 -0
- package/dist/ui-core/commands/command-handlers.js.map +1 -1
- package/dist/ui-core/commands/goal-commands.d.ts +3 -0
- package/dist/ui-core/commands/goal-commands.js +48 -0
- package/dist/ui-core/commands/goal-commands.js.map +1 -0
- package/dist/ui-core/commands/pickers/search-reasoning.js +10 -6
- package/dist/ui-core/commands/pickers/search-reasoning.js.map +1 -1
- package/dist/ui-core/commands/settings-commands.d.ts +3 -0
- package/dist/ui-core/commands/settings-commands.js +49 -0
- package/dist/ui-core/commands/settings-commands.js.map +1 -0
- package/dist/ui-core/controllers/overlay-controller.d.ts +7 -1
- package/dist/ui-core/controllers/overlay-controller.js +7 -1
- package/dist/ui-core/controllers/overlay-controller.js.map +1 -1
- package/dist/ui-core/motion/wheel-scroll.d.ts +2 -4
- package/dist/ui-core/motion/wheel-scroll.js +4 -20
- package/dist/ui-core/motion/wheel-scroll.js.map +1 -1
- package/dist/ui-core/rendering/artifact-pager-source.d.ts +1 -0
- package/dist/ui-core/rendering/artifact-pager-source.js.map +1 -1
- package/dist/ui-core/rendering/duration.d.ts +1 -1
- package/dist/ui-core/rendering/duration.js +2 -4
- package/dist/ui-core/rendering/duration.js.map +1 -1
- package/dist/ui-core/rendering/format-help.js +1 -1
- package/dist/ui-core/rendering/format-help.js.map +1 -1
- package/dist/ui-core/rendering/goal-format.d.ts +20 -0
- package/dist/ui-core/rendering/goal-format.js +136 -0
- package/dist/ui-core/rendering/goal-format.js.map +1 -0
- package/dist/ui-core/rendering/job-tail-source.js +4 -0
- package/dist/ui-core/rendering/job-tail-source.js.map +1 -1
- package/dist/ui-core/rendering/open-tool-output.d.ts +0 -1
- package/dist/ui-core/rendering/open-tool-output.js +8 -11
- package/dist/ui-core/rendering/open-tool-output.js.map +1 -1
- package/dist/ui-core/rendering/picker-layout.js +12 -1
- package/dist/ui-core/rendering/picker-layout.js.map +1 -1
- package/dist/ui-core/rendering/tool-output-pager-source.d.ts +1 -1
- package/dist/ui-core/rendering/tool-output-pager-source.js +2 -1
- package/dist/ui-core/rendering/tool-output-pager-source.js.map +1 -1
- package/dist/ui-core/state/transcript/apply-app-event.js +8 -2
- package/dist/ui-core/state/transcript/apply-app-event.js.map +1 -1
- package/dist/ui-core/state/transcript-types.d.ts +1 -0
- package/dist/ui-core/state/transcript-types.js.map +1 -1
- package/dist/version.generated.d.ts +2 -2
- package/dist/version.generated.js +2 -2
- package/package.json +1 -1
package/dist/llm/river-models.js
CHANGED
|
@@ -1,27 +1,83 @@
|
|
|
1
1
|
import { catalogEffortList, catalogEntriesFromPayload, parseCatalogFacts, } from "./catalog-facts.js";
|
|
2
2
|
export const RIVER_DEFAULT_MODEL = "deepseek-ai/DeepSeek-V4.1-Flash";
|
|
3
3
|
export const RIVER_GLM_MODEL = "zai-org/GLM-5.3-Flash";
|
|
4
|
+
const ONE_MILLION_CONTEXT = 1_048_576;
|
|
5
|
+
const DOCUMENTED_RIVER_MODELS = [
|
|
6
|
+
{
|
|
7
|
+
id: "moonshotai/Kimi-K3",
|
|
8
|
+
contextTokens: ONE_MILLION_CONTEXT,
|
|
9
|
+
maxOutputTokens: 1_048_575,
|
|
10
|
+
vision: true,
|
|
11
|
+
efforts: ["none", "low", "high", "max"],
|
|
12
|
+
defaultEffort: "max",
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
id: "deepseek-ai/DeepSeek-V4.1-Flash",
|
|
16
|
+
contextTokens: ONE_MILLION_CONTEXT,
|
|
17
|
+
maxOutputTokens: 393_216,
|
|
18
|
+
vision: true,
|
|
19
|
+
efforts: ["none", "low", "high", "max"],
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
id: "deepseek-ai/DeepSeek-V4.1-Flash-1017",
|
|
23
|
+
contextTokens: ONE_MILLION_CONTEXT,
|
|
24
|
+
maxOutputTokens: 393_216,
|
|
25
|
+
vision: true,
|
|
26
|
+
efforts: ["none", "low", "high", "max"],
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
id: "nvidia/NVIDIA-Nemotron-3.5-Super-VL-120B-A12B-NVFP4",
|
|
30
|
+
contextTokens: ONE_MILLION_CONTEXT,
|
|
31
|
+
maxOutputTokens: 1_048_575,
|
|
32
|
+
vision: true,
|
|
33
|
+
efforts: ["none", "medium", "high"],
|
|
34
|
+
defaultEffort: "high",
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
id: RIVER_GLM_MODEL,
|
|
38
|
+
contextTokens: ONE_MILLION_CONTEXT,
|
|
39
|
+
maxOutputTokens: 128_000,
|
|
40
|
+
vision: true,
|
|
41
|
+
efforts: ["low", "high", "max"],
|
|
42
|
+
defaultEffort: "max",
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
id: "GLM-5.3",
|
|
46
|
+
contextTokens: ONE_MILLION_CONTEXT,
|
|
47
|
+
maxOutputTokens: 128_000,
|
|
48
|
+
vision: false,
|
|
49
|
+
efforts: ["low", "high", "max"],
|
|
50
|
+
defaultEffort: "max",
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
id: "Qwen/Qwen3.8-27B-FP8",
|
|
54
|
+
contextTokens: 262_144,
|
|
55
|
+
maxOutputTokens: 262_143,
|
|
56
|
+
vision: true,
|
|
57
|
+
efforts: ["none", "low", "medium", "xhigh"],
|
|
58
|
+
defaultEffort: "xhigh",
|
|
59
|
+
},
|
|
60
|
+
];
|
|
61
|
+
const documentedById = new Map(DOCUMENTED_RIVER_MODELS.map((model) => [model.id.toLowerCase(), model]));
|
|
4
62
|
export function isRiverDeepSeekModel(model) {
|
|
5
63
|
return /deepseek/i.test(model);
|
|
6
64
|
}
|
|
7
65
|
export function documentedRiverModelFacts(model) {
|
|
8
|
-
const
|
|
9
|
-
if (
|
|
10
|
-
id !== `${RIVER_DEFAULT_MODEL}-1017`.toLowerCase() &&
|
|
11
|
-
id !== RIVER_GLM_MODEL.toLowerCase())
|
|
66
|
+
const documented = documentedById.get(model.trim().toLowerCase());
|
|
67
|
+
if (!documented)
|
|
12
68
|
return undefined;
|
|
13
|
-
const mandatory = id === RIVER_GLM_MODEL.toLowerCase();
|
|
14
69
|
return {
|
|
15
70
|
id: model,
|
|
16
|
-
contextTokens:
|
|
17
|
-
maxOutputTokens:
|
|
18
|
-
vision:
|
|
71
|
+
contextTokens: documented.contextTokens,
|
|
72
|
+
maxOutputTokens: documented.maxOutputTokens,
|
|
73
|
+
vision: documented.vision,
|
|
19
74
|
tools: true,
|
|
20
|
-
modalities: ["text", "image"],
|
|
75
|
+
modalities: documented.vision ? ["text", "image"] : ["text"],
|
|
21
76
|
reasoning: {
|
|
22
77
|
supported: true,
|
|
23
|
-
mandatory,
|
|
24
|
-
supportedEfforts:
|
|
78
|
+
mandatory: !documented.efforts.includes("none"),
|
|
79
|
+
supportedEfforts: documented.efforts,
|
|
80
|
+
...(documented.defaultEffort ? { defaultEffort: documented.defaultEffort } : {}),
|
|
25
81
|
},
|
|
26
82
|
};
|
|
27
83
|
}
|
|
@@ -59,15 +115,24 @@ function toolSupport(entry) {
|
|
|
59
115
|
}
|
|
60
116
|
return undefined;
|
|
61
117
|
}
|
|
62
|
-
|
|
118
|
+
function withoutUndefined(value) {
|
|
119
|
+
return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== undefined));
|
|
120
|
+
}
|
|
121
|
+
export function riverModelCatalog(payload, docs) {
|
|
63
122
|
const models = new Map();
|
|
64
123
|
for (const entry of catalogEntriesFromPayload(payload)) {
|
|
65
124
|
const parsed = parseCatalogFacts(entry);
|
|
66
125
|
if (!parsed)
|
|
67
126
|
continue;
|
|
68
127
|
const tools = toolSupport(entry);
|
|
128
|
+
const fromDocs = docs?.get(parsed.id.toLowerCase());
|
|
69
129
|
const facts = riverModelFacts(parsed.id, {
|
|
70
|
-
...
|
|
130
|
+
...fromDocs,
|
|
131
|
+
...withoutUndefined(parsed),
|
|
132
|
+
id: parsed.id,
|
|
133
|
+
...(fromDocs?.reasoning || parsed.reasoning
|
|
134
|
+
? { reasoning: { ...fromDocs?.reasoning, ...parsed.reasoning } }
|
|
135
|
+
: {}),
|
|
71
136
|
...(tools !== undefined ? { tools } : {}),
|
|
72
137
|
});
|
|
73
138
|
const reasoningEfforts = catalogEffortList(facts.reasoning?.supportedEfforts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"river-models.js","sourceRoot":"","sources":["../../src/llm/river-models.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,GAElB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,MAAM,mBAAmB,GAAG,iCAAiC,CAAC;AACrE,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"river-models.js","sourceRoot":"","sources":["../../src/llm/river-models.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/river.js
CHANGED
|
@@ -3,6 +3,7 @@ import { registerModelCatalog } from "./capabilities.js";
|
|
|
3
3
|
import { withModelCatalogFacts } from "./catalog-context.js";
|
|
4
4
|
import { openAiCompatibleComplete, openAiCompatiblePing, openAiCompatibleStream, ProviderError, readJson, toCompletionResult, } from "./http.js";
|
|
5
5
|
import { normalizeEndpointUrl } from "./provider.js";
|
|
6
|
+
import { isOfficialRiverEndpoint, loadRiverDocFacts } from "./river-docs.js";
|
|
6
7
|
import { RIVER_DEFAULT_MODEL, riverModelCatalog } from "./river-models.js";
|
|
7
8
|
const BASE_URL = "https://api.river.ai/v1";
|
|
8
9
|
const CATALOG_TTL_MS = 5 * 60 * 1000;
|
|
@@ -30,11 +31,14 @@ async function loadCatalog(auth, refresh = false) {
|
|
|
30
31
|
if (pending)
|
|
31
32
|
return pending;
|
|
32
33
|
const task = (async () => {
|
|
33
|
-
const response = await
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
const [response, docs] = await Promise.all([
|
|
35
|
+
fetch(`${baseUrl}/models`, {
|
|
36
|
+
headers: { authorization: `Bearer ${apiKey}` },
|
|
37
|
+
signal: AbortSignal.timeout(15_000),
|
|
38
|
+
}),
|
|
39
|
+
isOfficialRiverEndpoint(baseUrl) ? loadRiverDocFacts() : undefined,
|
|
40
|
+
]);
|
|
41
|
+
const models = riverModelCatalog(await readJson(response), docs);
|
|
38
42
|
catalogs.set(key, { expiresAt: Date.now() + CATALOG_TTL_MS, models });
|
|
39
43
|
while (catalogs.size > MAX_CATALOG_ROUTES)
|
|
40
44
|
catalogs.delete(catalogs.keys().next().value);
|
|
@@ -77,7 +81,6 @@ function requestOptions(request, auth) {
|
|
|
77
81
|
signal: request.signal,
|
|
78
82
|
reasoning: request.thinking,
|
|
79
83
|
reasoningStyle: "openai",
|
|
80
|
-
includeStreamUsage: false,
|
|
81
84
|
tools: request.tools,
|
|
82
85
|
toolChoice: request.toolChoice,
|
|
83
86
|
parallelToolCalls: request.parallelToolCalls,
|
package/dist/llm/river.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"river.js","sourceRoot":"","sources":["../../src/llm/river.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,oBAAoB,EAAqB,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,QAAQ,EACR,kBAAkB,GACnB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,oBAAoB,EAAuC,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,QAAQ,GAAG,yBAAyB,CAAC;AAC3C,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACrC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAC9B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyD,CAAC;AAClF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAC;AAEnE,SAAS,WAAW,CAAC,IAAkB;IACrC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/D,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC;KACtF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAkB,EAAE,OAAO,GAAG,KAAK;IAC5D,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,OAAO,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACxD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,MAAM,IAAI,GAAG,CAAC,KAAK,IAAI,EAAE;QACvB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"river.js","sourceRoot":"","sources":["../../src/llm/river.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,oBAAoB,EAAqB,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,QAAQ,EACR,kBAAkB,GACnB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,oBAAoB,EAAuC,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,QAAQ,GAAG,yBAAyB,CAAC;AAC3C,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACrC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAC9B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyD,CAAC;AAClF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAC;AAEnE,SAAS,WAAW,CAAC,IAAkB;IACrC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/D,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAC;KACtF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAkB,EAAE,OAAO,GAAG,KAAK;IAC5D,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,OAAO,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACxD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,MAAM,IAAI,GAAG,CAAC,KAAK,IAAI,EAAE;QACvB,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzC,KAAK,CAAC,GAAG,OAAO,SAAS,EAAE;gBACzB,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE;gBAC9C,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;aACpC,CAAC;YACF,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS;SACnE,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,QAAQ,CAAU,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1E,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;QACtE,OAAO,QAAQ,CAAC,IAAI,GAAG,kBAAkB;YACvC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,EAAE,CAAC;IACL,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC;QACH,OAAO,MAAM,IAAI,CAAC;IACpB,CAAC;YAAS,CAAC;QACT,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAkB,EAAE,MAAoB;IAC9D,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACtD,IAAI,KAAK,YAAY,aAAa,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC;YAClF,MAAM,KAAK,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,MAAM,CAC9B,MAAM,CAAC,MAAM,IAAI,IAAI,YAAY,CAAC,2BAA2B,EAAE,YAAY,CAAC,CAC7E,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,KAAK,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1F,IAAI,MAAM,CAAC,OAAO;YAAE,KAAK,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,OAA0B,EAAE,IAAkB;IACpE,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO;QACL,QAAQ,EAAE,OAAO;QACjB,UAAU,EAAE,OAAgB;QAC5B,GAAG,WAAW,CAAC,IAAI,CAAC;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,mBAAmB;QAC3C,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,cAAc,EAAE,QAAiB;QACjC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,+BAA+B,EAAE,OAAO,CAAC,iCAAiC;QAC1E,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;QAClD,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAgB;IACxC,EAAE,EAAE,OAAO;IACX,WAAW,EAAE,OAAO;IACpB,YAAY,EAAE,mBAAmB;IACjC,MAAM,EAAE,eAAe;IACvB,cAAc,EAAE,QAAQ;IACxB,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC;IACrD,KAAK,CAAC,UAAU,CAAC,IAAI;QACnB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7C,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,IAAI;QACb,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI;QAC1B,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QACjC,OAAO,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,kBAAkB,CAC1E,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAChE,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO;QACjC,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QACjC,OAAO,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,kBAAkB,CAC1E,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,sBAAsB,CAAC;YACnD,GAAG,OAAO;YACV,OAAO;YACP,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CACH,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
|
@@ -40,7 +40,7 @@ export function effortPreflightKey(route) {
|
|
|
40
40
|
].join("|");
|
|
41
41
|
}
|
|
42
42
|
export function needsEffortPreflight(route) {
|
|
43
|
-
if (route.purpose === "compaction" || route.purpose === "auxiliary") {
|
|
43
|
+
if (route.purpose === "compaction" || route.purpose === "evaluation" || route.purpose === "auxiliary") {
|
|
44
44
|
return false;
|
|
45
45
|
}
|
|
46
46
|
const key = effortPreflightKey(route);
|
|
@@ -54,6 +54,8 @@ export function needsEffortPreflight(route) {
|
|
|
54
54
|
return false;
|
|
55
55
|
if (isReasoningUnsupported(route.providerId, route.model))
|
|
56
56
|
return false;
|
|
57
|
+
if (route.providerId === "meta" && displayReasoningEfforts(route.providerId, route.model)?.length === 0)
|
|
58
|
+
return false;
|
|
57
59
|
if (!isSubagentProbe(route)) {
|
|
58
60
|
const { providerId, model, requested } = route;
|
|
59
61
|
const profile = resolveBuiltInProfile({ provider: providerId, model });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort-preflight.js","sourceRoot":"","sources":["../../../src/llm/wire/effort-preflight.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,EACxB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,EAC5B,kCAAkC,GACnC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,MAAM,CAAC,MAAM,kBAAkB,GAAkB;IAC/C,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,EAAE;CACpD,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAcvC,MAAM,cAAc,GAA+B;IACjD,MAAM;IACN,KAAK;IACL,QAAQ;IACR,MAAM;IACN,OAAO;IACP,KAAK;CACN,CAAC;AAEF,MAAM,UAAU,GAA+B,CAAC,GAAG,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC;AAEhF,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAC1D,CAAC;AAEF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;AAErC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAgD,CAAC;AAE9E,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuC,CAAC;AAErE,SAAS,MAAM,CAAC,MAAuB;IACrC,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,eAAe,CAAC,KAA2B;IAClD,OAAO,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAA2B;IAC5D,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5D,OAAO;QACL,sBAAsB,EAAE,IAAI,QAAQ;QACpC,KAAK,CAAC,UAAU;QAChB,QAAQ;QACR,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,SAAS;QACf,KAAK,CAAC,OAAO,IAAI,UAAU;KAC5B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAA2B;IAC9D,IAAI,KAAK,CAAC,OAAO,KAAK,YAAY,IAAI,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"effort-preflight.js","sourceRoot":"","sources":["../../../src/llm/wire/effort-preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { ProviderId } from "../../types.js";
|
|
2
|
+
import type { CatalogModel } from "../capabilities.js";
|
|
2
3
|
export declare function catalogEntryVision(entry: unknown): boolean | undefined;
|
|
4
|
+
export declare function parseModelCatalogEntries(entries: readonly unknown[]): CatalogModel[];
|
|
3
5
|
export declare function ingestModelCatalogEntries(provider: ProviderId, entries: readonly unknown[]): string[];
|
|
4
6
|
export declare function ingestOpenAiModelCatalog(provider: ProviderId, payload: unknown): string[];
|
|
@@ -3,7 +3,7 @@ import { catalogEffortList, catalogEntriesFromPayload, parseCatalogFacts, } from
|
|
|
3
3
|
export function catalogEntryVision(entry) {
|
|
4
4
|
return parseCatalogFacts(entry)?.vision;
|
|
5
5
|
}
|
|
6
|
-
export function
|
|
6
|
+
export function parseModelCatalogEntries(entries) {
|
|
7
7
|
const models = [];
|
|
8
8
|
const seen = new Set();
|
|
9
9
|
for (const entry of entries) {
|
|
@@ -24,6 +24,10 @@ export function ingestModelCatalogEntries(provider, entries) {
|
|
|
24
24
|
...(reasoningEfforts === undefined ? {} : { reasoningEfforts }),
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
+
return models;
|
|
28
|
+
}
|
|
29
|
+
export function ingestModelCatalogEntries(provider, entries) {
|
|
30
|
+
const models = parseModelCatalogEntries(entries);
|
|
27
31
|
if (models.length > 0)
|
|
28
32
|
registerModelCatalog(provider, models);
|
|
29
33
|
return models.map((model) => model.id).sort();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../../../src/llm/wire/model-catalog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../../../src/llm/wire/model-catalog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAA2B;IAClE,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,SAAS;QAC3B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACb,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC;QAC7C,MAAM,gBAAgB,GAAG,iBAAiB,CACxC,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAClC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC;YACV,EAAE;YACF,KAAK;YACL,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/D,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;YACjD,GAAG,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC;SAChE,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,QAAoB,EACpB,OAA2B;IAE3B,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAoB,EACpB,OAAgB;IAEhB,OAAO,yBAAyB,CAC9B,QAAQ,EACR,yBAAyB,CAAC,OAAO,CAAC,CACnC,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { modelReasoningEfforts, modelSupportsThinking, } from "../capabilities.js";
|
|
1
|
+
import { displayReasoningEfforts, modelReasoningEfforts, modelSupportsThinking, } from "../capabilities.js";
|
|
2
2
|
import { classifyBynaraModel, classifyNvidiaModel } from "../model-families.js";
|
|
3
3
|
import { metaReasoningEffort } from "../meta-effort.js";
|
|
4
4
|
import { emitReasoningControls } from "../reasoning-controls.js";
|
|
@@ -48,9 +48,9 @@ export function buildReasoningPayload(reasoning, style, model, providerId, contr
|
|
|
48
48
|
};
|
|
49
49
|
switch (style) {
|
|
50
50
|
case "meta": {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
return {
|
|
51
|
+
const id = model ?? "";
|
|
52
|
+
const mapped = metaReasoningEffort(enabled ? effort : "none", id, displayReasoningEfforts("meta", id));
|
|
53
|
+
return mapped === undefined ? {} : { reasoning_effort: mapped };
|
|
54
54
|
}
|
|
55
55
|
case "openai": {
|
|
56
56
|
if (!enabled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoning-payload.js","sourceRoot":"","sources":["../../../src/llm/wire/reasoning-payload.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"reasoning-payload.js","sourceRoot":"","sources":["../../../src/llm/wire/reasoning-payload.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
const ATTRIBUTES = new Map([
|
|
2
|
+
[3, 23], [4, 24], [5, 25], [6, 25], [7, 27],
|
|
3
|
+
[8, 28], [9, 29], [21, 24], [53, 55],
|
|
4
|
+
]);
|
|
5
|
+
const RESETS = new Set([23, 24, 25, 27, 28, 29, 39, 49, 55, 59]);
|
|
6
|
+
function colorLength(codes, index) {
|
|
7
|
+
const mode = codes[index + 1];
|
|
8
|
+
const length = mode === 5 ? 3 : mode === 2 ? 5 : 0;
|
|
9
|
+
if (length === 0 || index + length > codes.length)
|
|
10
|
+
return 0;
|
|
11
|
+
const channels = codes.slice(index + 2, index + length);
|
|
12
|
+
return channels.every((channel) => channel >= 0 && channel <= 255) ? length : 0;
|
|
13
|
+
}
|
|
14
|
+
function applyAttribute(state, code) {
|
|
15
|
+
if (code === 1 || code === 2) {
|
|
16
|
+
const intensity = state.get(22) ?? "";
|
|
17
|
+
state.set(22, [1, 2].filter((value) => value === code || intensity.includes(String(value))).join(";"));
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
if (code === 22) {
|
|
21
|
+
state.delete(22);
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
const reset = ATTRIBUTES.get(code);
|
|
25
|
+
if (reset !== undefined)
|
|
26
|
+
state.set(reset, String(code));
|
|
27
|
+
else if (RESETS.has(code))
|
|
28
|
+
state.delete(code);
|
|
29
|
+
else
|
|
30
|
+
return false;
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
function applyColor(state, code) {
|
|
34
|
+
if ((code >= 30 && code <= 37) || (code >= 90 && code <= 97))
|
|
35
|
+
state.set(39, String(code));
|
|
36
|
+
else if ((code >= 40 && code <= 47) || (code >= 100 && code <= 107))
|
|
37
|
+
state.set(49, String(code));
|
|
38
|
+
else
|
|
39
|
+
return false;
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
export function applySgr(state, body) {
|
|
43
|
+
if (!/^[\d;]*$/.test(body))
|
|
44
|
+
return undefined;
|
|
45
|
+
const codes = body.split(";").map(Number);
|
|
46
|
+
let next = state === undefined ? undefined : new Map(state);
|
|
47
|
+
for (let index = 0; index < codes.length; index += 1) {
|
|
48
|
+
const code = codes[index];
|
|
49
|
+
if (code === 0) {
|
|
50
|
+
next = new Map();
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
if (code === 38 || code === 48 || code === 58) {
|
|
54
|
+
const length = colorLength(codes, index);
|
|
55
|
+
if (length === 0)
|
|
56
|
+
return undefined;
|
|
57
|
+
next?.set(code + 1, codes.slice(index, index + length).join(";"));
|
|
58
|
+
index += length - 1;
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
if (next === undefined)
|
|
62
|
+
continue;
|
|
63
|
+
if (!applyColor(next, code) && !applyAttribute(next, code))
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
return next;
|
|
67
|
+
}
|
|
68
|
+
export function sgrDifference(previous, next) {
|
|
69
|
+
const codes = [];
|
|
70
|
+
for (const [reset, value] of previous) {
|
|
71
|
+
if (!next.has(reset) || (reset === 22 && value !== next.get(reset)))
|
|
72
|
+
codes.push(String(reset));
|
|
73
|
+
}
|
|
74
|
+
for (const [reset, value] of next) {
|
|
75
|
+
if (value !== previous.get(reset))
|
|
76
|
+
codes.push(value);
|
|
77
|
+
}
|
|
78
|
+
return codes.length === 0 ? "" : `\x1b[${codes.join(";")}m`;
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=sgr-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sgr-state.js","sourceRoot":"","sources":["../../src/os/sgr-state.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;IAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;CACrC,CAAC,CAAC;AACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAEjE,SAAS,WAAW,CAAC,KAAwB,EAAE,KAAa;IAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,IAAI,MAAM,KAAK,CAAC,IAAI,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;IACxD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,IAAI,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,cAAc,CAAC,KAA0B,EAAE,IAAY;IAC9D,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QACtC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvG,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;SACnD,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;;QACzC,OAAO,KAAK,CAAC;IAClB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,KAA0B,EAAE,IAAY;IAC1D,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;QAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;SACrF,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC;QAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;;QAC5F,OAAO,KAAK,CAAC;IAClB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAA2B,EAAE,IAAY;IAChE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAE,CAAC;QAC3B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACf,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACjB,SAAS;QACX,CAAC;QACD,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACzC,IAAI,MAAM,KAAK,CAAC;gBAAE,OAAO,SAAS,CAAC;YACnC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,KAAK,IAAI,MAAM,GAAG,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;IAC/E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAkB,EAAE,IAAc;IAC9D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACjG,CAAC;IACD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,KAAK,KAAK,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;AAC9D,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export declare class TerminalSgrCompactor {
|
|
2
|
+
private emitted;
|
|
3
|
+
private desired;
|
|
4
|
+
private pendingStyle;
|
|
5
|
+
private pendingEscape;
|
|
6
|
+
private controlString;
|
|
7
|
+
private stringEscape;
|
|
8
|
+
private passthroughCsi;
|
|
9
|
+
compact(bytes: Uint8Array): Uint8Array;
|
|
10
|
+
finish(): Uint8Array;
|
|
11
|
+
private consumeString;
|
|
12
|
+
private consumeCsi;
|
|
13
|
+
private consumeEscape;
|
|
14
|
+
private consumeSequence;
|
|
15
|
+
private consumeStyle;
|
|
16
|
+
private flushStyle;
|
|
17
|
+
}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { applySgr, sgrDifference } from "./sgr-state.js";
|
|
2
|
+
const CURSOR_ONLY = /^\x1b\[[\d;]*[ABCDEFGHf`ade]$/;
|
|
3
|
+
const CONTROL_STRING_START = new Set(["]", "P", "_", "^", "X"]);
|
|
4
|
+
const MAX_SEQUENCE_LENGTH = 512;
|
|
5
|
+
function csiEnd(input, start) {
|
|
6
|
+
for (let index = start + 2; index < input.length; index += 1) {
|
|
7
|
+
const code = input.charCodeAt(index);
|
|
8
|
+
if (code >= 0x40 && code <= 0x7e)
|
|
9
|
+
return index + 1;
|
|
10
|
+
if (code < 0x20 || code > 0x3f)
|
|
11
|
+
return index;
|
|
12
|
+
}
|
|
13
|
+
return input.length;
|
|
14
|
+
}
|
|
15
|
+
export class TerminalSgrCompactor {
|
|
16
|
+
emitted;
|
|
17
|
+
desired;
|
|
18
|
+
pendingStyle = "";
|
|
19
|
+
pendingEscape = "";
|
|
20
|
+
controlString;
|
|
21
|
+
stringEscape = false;
|
|
22
|
+
passthroughCsi = false;
|
|
23
|
+
compact(bytes) {
|
|
24
|
+
const input = this.pendingEscape + Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString("latin1");
|
|
25
|
+
this.pendingEscape = "";
|
|
26
|
+
const output = [];
|
|
27
|
+
let index = 0;
|
|
28
|
+
while (index < input.length) {
|
|
29
|
+
if (this.controlString) {
|
|
30
|
+
const end = this.consumeString(input, index);
|
|
31
|
+
output.push(input.slice(index, end));
|
|
32
|
+
index = end;
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
if (this.passthroughCsi) {
|
|
36
|
+
const end = this.consumeCsi(input, index);
|
|
37
|
+
output.push(input.slice(index, end));
|
|
38
|
+
index = end;
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const escape = input.indexOf("\x1b", index);
|
|
42
|
+
const end = escape < 0 ? input.length : escape;
|
|
43
|
+
if (end > index) {
|
|
44
|
+
output.push(this.flushStyle(), input.slice(index, end));
|
|
45
|
+
index = end;
|
|
46
|
+
}
|
|
47
|
+
if (escape < 0)
|
|
48
|
+
break;
|
|
49
|
+
index = this.consumeEscape(input, index, output);
|
|
50
|
+
}
|
|
51
|
+
output.push(this.flushStyle());
|
|
52
|
+
return Buffer.from(output.join(""), "latin1");
|
|
53
|
+
}
|
|
54
|
+
finish() {
|
|
55
|
+
const bytes = Buffer.from(this.flushStyle() + this.pendingEscape, "latin1");
|
|
56
|
+
this.pendingEscape = "";
|
|
57
|
+
this.controlString = undefined;
|
|
58
|
+
this.stringEscape = false;
|
|
59
|
+
this.passthroughCsi = false;
|
|
60
|
+
this.emitted = undefined;
|
|
61
|
+
this.desired = undefined;
|
|
62
|
+
return bytes;
|
|
63
|
+
}
|
|
64
|
+
consumeString(input, start) {
|
|
65
|
+
for (let index = start; index < input.length; index += 1) {
|
|
66
|
+
const char = input[index];
|
|
67
|
+
if ((this.stringEscape && char === "\\") || (this.controlString === "osc" && char === "\x07")) {
|
|
68
|
+
this.controlString = undefined;
|
|
69
|
+
this.stringEscape = false;
|
|
70
|
+
return index + 1;
|
|
71
|
+
}
|
|
72
|
+
this.stringEscape = char === "\x1b";
|
|
73
|
+
}
|
|
74
|
+
return input.length;
|
|
75
|
+
}
|
|
76
|
+
consumeCsi(input, start) {
|
|
77
|
+
for (let index = start; index < input.length; index += 1) {
|
|
78
|
+
const code = input.charCodeAt(index);
|
|
79
|
+
if (code >= 0x40 && code <= 0x7e) {
|
|
80
|
+
this.passthroughCsi = false;
|
|
81
|
+
return index + 1;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return input.length;
|
|
85
|
+
}
|
|
86
|
+
consumeEscape(input, start, output) {
|
|
87
|
+
const kind = input[start + 1];
|
|
88
|
+
if (kind === undefined) {
|
|
89
|
+
this.pendingEscape = input.slice(start);
|
|
90
|
+
return input.length;
|
|
91
|
+
}
|
|
92
|
+
if (CONTROL_STRING_START.has(kind)) {
|
|
93
|
+
output.push(this.flushStyle(), input.slice(start, start + 2));
|
|
94
|
+
this.emitted = undefined;
|
|
95
|
+
this.desired = undefined;
|
|
96
|
+
this.controlString = kind === "]" ? "osc" : "other";
|
|
97
|
+
return start + 2;
|
|
98
|
+
}
|
|
99
|
+
if (kind === "[")
|
|
100
|
+
return this.consumeSequence(input, start, output);
|
|
101
|
+
let end = start + 1;
|
|
102
|
+
while (end < input.length && input.charCodeAt(end) >= 0x20 && input.charCodeAt(end) <= 0x2f)
|
|
103
|
+
end += 1;
|
|
104
|
+
if (end === input.length && end - start <= MAX_SEQUENCE_LENGTH) {
|
|
105
|
+
this.pendingEscape = input.slice(start);
|
|
106
|
+
return end;
|
|
107
|
+
}
|
|
108
|
+
output.push(this.flushStyle(), input.slice(start, end + 1));
|
|
109
|
+
this.emitted = undefined;
|
|
110
|
+
this.desired = undefined;
|
|
111
|
+
return end + 1;
|
|
112
|
+
}
|
|
113
|
+
consumeSequence(input, start, output) {
|
|
114
|
+
const end = csiEnd(input, start);
|
|
115
|
+
const sequence = input.slice(start, end);
|
|
116
|
+
const final = sequence.charCodeAt(sequence.length - 1);
|
|
117
|
+
if (final < 0x40 || final > 0x7e || sequence.length < 3) {
|
|
118
|
+
if (end === input.length && sequence.length <= MAX_SEQUENCE_LENGTH) {
|
|
119
|
+
this.pendingEscape = sequence;
|
|
120
|
+
return end;
|
|
121
|
+
}
|
|
122
|
+
output.push(this.flushStyle(), sequence);
|
|
123
|
+
this.emitted = undefined;
|
|
124
|
+
this.desired = undefined;
|
|
125
|
+
this.passthroughCsi = end === input.length;
|
|
126
|
+
return end;
|
|
127
|
+
}
|
|
128
|
+
if (sequence.endsWith("m"))
|
|
129
|
+
this.consumeStyle(sequence, output);
|
|
130
|
+
else if (CURSOR_ONLY.test(sequence))
|
|
131
|
+
output.push(sequence);
|
|
132
|
+
else {
|
|
133
|
+
output.push(this.flushStyle(), sequence);
|
|
134
|
+
this.emitted = undefined;
|
|
135
|
+
this.desired = undefined;
|
|
136
|
+
}
|
|
137
|
+
return end;
|
|
138
|
+
}
|
|
139
|
+
consumeStyle(sequence, output) {
|
|
140
|
+
const next = applySgr(this.desired, sequence.slice(2, -1));
|
|
141
|
+
if (this.emitted === undefined || next === undefined) {
|
|
142
|
+
output.push(this.flushStyle(), sequence);
|
|
143
|
+
this.emitted = next;
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
this.pendingStyle += sequence;
|
|
147
|
+
}
|
|
148
|
+
this.desired = next;
|
|
149
|
+
if (this.pendingStyle.length > MAX_SEQUENCE_LENGTH)
|
|
150
|
+
output.push(this.flushStyle());
|
|
151
|
+
}
|
|
152
|
+
flushStyle() {
|
|
153
|
+
const original = this.pendingStyle;
|
|
154
|
+
if (!original)
|
|
155
|
+
return "";
|
|
156
|
+
this.pendingStyle = "";
|
|
157
|
+
if (this.emitted === undefined || this.desired === undefined)
|
|
158
|
+
return original;
|
|
159
|
+
const difference = sgrDifference(this.emitted, this.desired);
|
|
160
|
+
this.emitted = this.desired;
|
|
161
|
+
return difference.length < original.length ? difference : original;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=terminal-sgr-compactor.js.map
|