@pentoshi/clai 5.1.4 → 5.1.6
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 +38 -0
- 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 +8 -5
- 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/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 +5 -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/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/paint-pacing.js +1 -5
- package/dist/classic/app/paint-pacing.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/blocks/notice-lines.js +17 -3
- package/dist/classic/blocks/notice-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/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/llm/capability/vision-patterns.js +7 -1
- package/dist/llm/capability/vision-patterns.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/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 -5
- package/dist/llm/river.js.map +1 -1
- package/dist/llm/wire/effort-preflight.js +1 -1
- package/dist/llm/wire/effort-preflight.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/session-runtime/client.js +7 -2
- package/dist/session-runtime/client.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/tui-v2/app/App.js +2 -1
- package/dist/tui-v2/app/App.js.map +1 -1
- package/dist/tui-v2/bootstrap/patch-opentui-frame-loop.d.ts +1 -0
- package/dist/tui-v2/bootstrap/patch-opentui-frame-loop.js +17 -0
- package/dist/tui-v2/bootstrap/patch-opentui-frame-loop.js.map +1 -0
- package/dist/tui-v2/bootstrap/runtime-view.js +2 -0
- package/dist/tui-v2/bootstrap/runtime-view.js.map +1 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js +2 -0
- 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/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.js +34 -10
- package/dist/tui-v2/components/transcript/tool-card.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-scroll-port.d.ts +8 -2
- package/dist/tui-v2/components/transcript/transcript-scroll-port.js +41 -19
- package/dist/tui-v2/components/transcript/transcript-scroll-port.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-view.js +11 -8
- package/dist/tui-v2/components/transcript/transcript-view.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/ui-core/commands/command-handlers.js +2 -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 +6 -2
- package/dist/ui-core/commands/pickers/search-reasoning.js.map +1 -1
- package/dist/ui-core/motion/wheel-scroll.d.ts +5 -2
- package/dist/ui-core/motion/wheel-scroll.js +17 -13
- package/dist/ui-core/motion/wheel-scroll.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/open-tool-output.js +18 -8
- package/dist/ui-core/rendering/open-tool-output.js.map +1 -1
- package/dist/ui-core/rendering/tool-presenter.d.ts +8 -2
- package/dist/ui-core/rendering/tool-presenter.js +40 -18
- package/dist/ui-core/rendering/tool-presenter.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
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
const DOCS_ORIGIN = "https://docs.river.ai";
|
|
2
|
+
const LIMITS_URL = `${DOCS_ORIGIN}/guides/inference-models.md`;
|
|
3
|
+
const CONTROLS_URL = `${DOCS_ORIGIN}/guides/inference-controls.md`;
|
|
4
|
+
const OFFICIAL_API_HOST = "api.river.ai";
|
|
5
|
+
const FETCH_TIMEOUT_MS = 4_000;
|
|
6
|
+
const MAX_DOC_CHARS = 512 * 1024;
|
|
7
|
+
const SUCCESS_TTL_MS = 60 * 60 * 1000;
|
|
8
|
+
const FAILURE_TTL_MS = 5 * 60 * 1000;
|
|
9
|
+
const MIN_CONTEXT_TOKENS = 8_192;
|
|
10
|
+
const MAX_CONTEXT_TOKENS = 16_777_216;
|
|
11
|
+
const EFFORT_VOCABULARY = new Set([
|
|
12
|
+
"none",
|
|
13
|
+
"minimal",
|
|
14
|
+
"low",
|
|
15
|
+
"medium",
|
|
16
|
+
"high",
|
|
17
|
+
"xhigh",
|
|
18
|
+
"max",
|
|
19
|
+
]);
|
|
20
|
+
let cached;
|
|
21
|
+
let pending;
|
|
22
|
+
function splitRow(line) {
|
|
23
|
+
const trimmed = line.trim();
|
|
24
|
+
if (!trimmed.startsWith("|") || !trimmed.endsWith("|"))
|
|
25
|
+
return undefined;
|
|
26
|
+
return trimmed.slice(1, -1).split("|").map((cell) => cell.trim());
|
|
27
|
+
}
|
|
28
|
+
function tableRows(markdown, firstHeader) {
|
|
29
|
+
const lines = markdown.split(/\r?\n/);
|
|
30
|
+
const start = lines.findIndex((line) => {
|
|
31
|
+
const cells = splitRow(line);
|
|
32
|
+
return cells !== undefined && firstHeader.test(cells[0] ?? "");
|
|
33
|
+
});
|
|
34
|
+
if (start < 0)
|
|
35
|
+
return [];
|
|
36
|
+
const rows = [];
|
|
37
|
+
for (const line of lines.slice(start + 2)) {
|
|
38
|
+
const cells = splitRow(line);
|
|
39
|
+
if (!cells)
|
|
40
|
+
break;
|
|
41
|
+
rows.push(cells);
|
|
42
|
+
}
|
|
43
|
+
return rows;
|
|
44
|
+
}
|
|
45
|
+
function backticked(cell) {
|
|
46
|
+
return [...cell.matchAll(/`([^`]+)`/g)].map((match) => match[1].trim());
|
|
47
|
+
}
|
|
48
|
+
function tokenCount(cell) {
|
|
49
|
+
const match = /^([\d,]+)\s*(K)?\b/i.exec(cell?.trim() ?? "");
|
|
50
|
+
if (!match)
|
|
51
|
+
return undefined;
|
|
52
|
+
const digits = Number(match[1].replace(/,/g, ""));
|
|
53
|
+
if (!Number.isSafeInteger(digits) || digits <= 0)
|
|
54
|
+
return undefined;
|
|
55
|
+
return match[2] ? digits * 1_000 : digits;
|
|
56
|
+
}
|
|
57
|
+
export function parseRiverLimitsTable(markdown) {
|
|
58
|
+
const rows = [];
|
|
59
|
+
for (const cells of tableRows(markdown, /^model id$/i)) {
|
|
60
|
+
const id = backticked(cells[0] ?? "")[0];
|
|
61
|
+
const contextTokens = tokenCount(cells[1]);
|
|
62
|
+
if (!id || contextTokens === undefined)
|
|
63
|
+
continue;
|
|
64
|
+
if (contextTokens < MIN_CONTEXT_TOKENS || contextTokens > MAX_CONTEXT_TOKENS)
|
|
65
|
+
continue;
|
|
66
|
+
const maxOutput = tokenCount(cells[2]);
|
|
67
|
+
rows.push({
|
|
68
|
+
id,
|
|
69
|
+
contextTokens,
|
|
70
|
+
maxOutputTokens: maxOutput !== undefined && maxOutput <= contextTokens ? maxOutput : undefined,
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
return rows;
|
|
74
|
+
}
|
|
75
|
+
export function parseRiverControlsTable(markdown) {
|
|
76
|
+
const rows = [];
|
|
77
|
+
for (const cells of tableRows(markdown, /^model$/i)) {
|
|
78
|
+
const name = (cells[0] ?? "").replace(/`/g, "").trim();
|
|
79
|
+
const efforts = [
|
|
80
|
+
...new Set(backticked(cells[2] ?? "")
|
|
81
|
+
.map((effort) => effort.toLowerCase())
|
|
82
|
+
.filter((effort) => EFFORT_VOCABULARY.has(effort))),
|
|
83
|
+
];
|
|
84
|
+
if (!name || efforts.length === 0)
|
|
85
|
+
continue;
|
|
86
|
+
const defaultEffort = backticked(cells[1] ?? "")
|
|
87
|
+
.map((effort) => effort.toLowerCase())
|
|
88
|
+
.find((effort) => EFFORT_VOCABULARY.has(effort) && efforts.includes(effort));
|
|
89
|
+
rows.push({ name, efforts, defaultEffort });
|
|
90
|
+
}
|
|
91
|
+
return rows;
|
|
92
|
+
}
|
|
93
|
+
function shortName(id) {
|
|
94
|
+
return id.slice(id.lastIndexOf("/") + 1).toLowerCase();
|
|
95
|
+
}
|
|
96
|
+
export function riverDocFactsFromMarkdown(limitsMarkdown, controlsMarkdown) {
|
|
97
|
+
const controls = new Map(parseRiverControlsTable(controlsMarkdown).map((row) => [row.name.toLowerCase(), row]));
|
|
98
|
+
const facts = new Map();
|
|
99
|
+
for (const limits of parseRiverLimitsTable(limitsMarkdown)) {
|
|
100
|
+
const control = controls.get(shortName(limits.id));
|
|
101
|
+
facts.set(limits.id.toLowerCase(), {
|
|
102
|
+
id: limits.id,
|
|
103
|
+
contextTokens: limits.contextTokens,
|
|
104
|
+
...(limits.maxOutputTokens !== undefined
|
|
105
|
+
? { maxOutputTokens: limits.maxOutputTokens }
|
|
106
|
+
: {}),
|
|
107
|
+
...(control
|
|
108
|
+
? {
|
|
109
|
+
reasoning: {
|
|
110
|
+
supported: true,
|
|
111
|
+
mandatory: !control.efforts.includes("none"),
|
|
112
|
+
supportedEfforts: control.efforts,
|
|
113
|
+
...(control.defaultEffort ? { defaultEffort: control.defaultEffort } : {}),
|
|
114
|
+
},
|
|
115
|
+
}
|
|
116
|
+
: {}),
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
return facts;
|
|
120
|
+
}
|
|
121
|
+
export function isOfficialRiverEndpoint(baseUrl) {
|
|
122
|
+
try {
|
|
123
|
+
return new URL(baseUrl).hostname.toLowerCase() === OFFICIAL_API_HOST;
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
async function fetchMarkdown(url) {
|
|
130
|
+
const response = await fetch(url, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) });
|
|
131
|
+
if (!response.ok)
|
|
132
|
+
throw new Error(`River docs returned ${response.status}`);
|
|
133
|
+
const text = await response.text();
|
|
134
|
+
if (text.length > MAX_DOC_CHARS)
|
|
135
|
+
throw new Error("River docs response too large");
|
|
136
|
+
return text;
|
|
137
|
+
}
|
|
138
|
+
async function fetchRiverDocFacts() {
|
|
139
|
+
const [limits, controls] = await Promise.all([
|
|
140
|
+
fetchMarkdown(LIMITS_URL),
|
|
141
|
+
fetchMarkdown(CONTROLS_URL),
|
|
142
|
+
]);
|
|
143
|
+
return riverDocFactsFromMarkdown(limits, controls);
|
|
144
|
+
}
|
|
145
|
+
export function loadRiverDocFacts() {
|
|
146
|
+
if (cached && Date.now() < cached.expiresAt)
|
|
147
|
+
return Promise.resolve(cached.facts);
|
|
148
|
+
if (pending)
|
|
149
|
+
return pending;
|
|
150
|
+
const task = fetchRiverDocFacts()
|
|
151
|
+
.then((facts) => {
|
|
152
|
+
cached = { expiresAt: Date.now() + SUCCESS_TTL_MS, facts };
|
|
153
|
+
return facts;
|
|
154
|
+
})
|
|
155
|
+
.catch(() => {
|
|
156
|
+
const facts = cached?.facts ?? new Map();
|
|
157
|
+
cached = { expiresAt: Date.now() + FAILURE_TTL_MS, facts };
|
|
158
|
+
return facts;
|
|
159
|
+
})
|
|
160
|
+
.finally(() => {
|
|
161
|
+
pending = undefined;
|
|
162
|
+
});
|
|
163
|
+
pending = task;
|
|
164
|
+
return task;
|
|
165
|
+
}
|
|
166
|
+
export function resetRiverDocFacts() {
|
|
167
|
+
cached = undefined;
|
|
168
|
+
pending = undefined;
|
|
169
|
+
}
|
|
170
|
+
//# sourceMappingURL=river-docs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"river-docs.js","sourceRoot":"","sources":["../../src/llm/river-docs.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,8 @@ import type { CatalogModel } from "./capabilities.js";
|
|
|
2
2
|
import { type CatalogFacts } from "./catalog-facts.js";
|
|
3
3
|
export declare const RIVER_DEFAULT_MODEL = "deepseek-ai/DeepSeek-V4.1-Flash";
|
|
4
4
|
export declare const RIVER_GLM_MODEL = "zai-org/GLM-5.3-Flash";
|
|
5
|
+
export type RiverDocFacts = ReadonlyMap<string, CatalogFacts>;
|
|
5
6
|
export declare function isRiverDeepSeekModel(model: string): boolean;
|
|
6
7
|
export declare function documentedRiverModelFacts(model: string): CatalogFacts | undefined;
|
|
7
8
|
export declare function riverModelFacts(model: string, live?: CatalogFacts): CatalogFacts | undefined;
|
|
8
|
-
export declare function riverModelCatalog(payload: unknown): CatalogModel[];
|
|
9
|
+
export declare function riverModelCatalog(payload: unknown, docs?: RiverDocFacts): CatalogModel[];
|
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);
|
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":"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"}
|
|
@@ -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);
|
|
@@ -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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"}
|
|
@@ -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":"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"}
|
|
@@ -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
|
+
}
|