helixmind 0.6.4 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/agent/loop.d.ts.map +1 -1
- package/dist/cli/agent/loop.js +18 -11
- package/dist/cli/agent/loop.js.map +1 -1
- package/dist/cli/agent/permissions.d.ts +16 -0
- package/dist/cli/agent/permissions.d.ts.map +1 -1
- package/dist/cli/agent/permissions.js +74 -5
- package/dist/cli/agent/permissions.js.map +1 -1
- package/dist/cli/agent/sandbox.d.ts.map +1 -1
- package/dist/cli/agent/sandbox.js +3 -0
- package/dist/cli/agent/sandbox.js.map +1 -1
- package/dist/cli/brain/archive.d.ts.map +1 -1
- package/dist/cli/brain/archive.js +48 -18
- package/dist/cli/brain/archive.js.map +1 -1
- package/dist/cli/brain/control-protocol.d.ts +17 -0
- package/dist/cli/brain/control-protocol.d.ts.map +1 -1
- package/dist/cli/brain/control-protocol.js +79 -0
- package/dist/cli/brain/control-protocol.js.map +1 -1
- package/dist/cli/brain/path-guard.d.ts +2 -0
- package/dist/cli/brain/path-guard.d.ts.map +1 -0
- package/dist/cli/brain/path-guard.js +94 -0
- package/dist/cli/brain/path-guard.js.map +1 -0
- package/dist/cli/brain/relay-client.d.ts +2 -0
- package/dist/cli/brain/relay-client.d.ts.map +1 -1
- package/dist/cli/brain/relay-client.js +58 -8
- package/dist/cli/brain/relay-client.js.map +1 -1
- package/dist/cli/brain/server.d.ts.map +1 -1
- package/dist/cli/brain/server.js +235 -23
- package/dist/cli/brain/server.js.map +1 -1
- package/dist/cli/brain/stdout-capture.d.ts +11 -0
- package/dist/cli/brain/stdout-capture.d.ts.map +1 -1
- package/dist/cli/brain/stdout-capture.js +42 -1
- package/dist/cli/brain/stdout-capture.js.map +1 -1
- package/dist/cli/brain/web-chat-handler.d.ts.map +1 -1
- package/dist/cli/brain/web-chat-handler.js +7 -0
- package/dist/cli/brain/web-chat-handler.js.map +1 -1
- package/dist/cli/checkpoints/revert.d.ts +5 -0
- package/dist/cli/checkpoints/revert.d.ts.map +1 -1
- package/dist/cli/checkpoints/revert.js +100 -11
- package/dist/cli/checkpoints/revert.js.map +1 -1
- package/dist/cli/checkpoints/store.d.ts +3 -0
- package/dist/cli/checkpoints/store.d.ts.map +1 -1
- package/dist/cli/checkpoints/store.js.map +1 -1
- package/dist/cli/commands/chat.d.ts.map +1 -1
- package/dist/cli/commands/chat.js +138 -73
- package/dist/cli/commands/chat.js.map +1 -1
- package/dist/cli/config/store.js +1 -1
- package/dist/cli/config/store.js.map +1 -1
- package/dist/cli/core/input.d.ts +0 -1
- package/dist/cli/core/input.d.ts.map +1 -1
- package/dist/cli/core/input.js +9 -17
- package/dist/cli/core/input.js.map +1 -1
- package/dist/cli/jarvis/autonomy.d.ts +13 -1
- package/dist/cli/jarvis/autonomy.d.ts.map +1 -1
- package/dist/cli/jarvis/autonomy.js +33 -1
- package/dist/cli/jarvis/autonomy.js.map +1 -1
- package/dist/cli/jarvis/core-ethics.d.ts +15 -0
- package/dist/cli/jarvis/core-ethics.d.ts.map +1 -1
- package/dist/cli/jarvis/core-ethics.js +110 -9
- package/dist/cli/jarvis/core-ethics.js.map +1 -1
- package/dist/cli/jarvis/daemon.d.ts.map +1 -1
- package/dist/cli/jarvis/daemon.js +8 -0
- package/dist/cli/jarvis/daemon.js.map +1 -1
- package/dist/cli/jarvis/instance-lock.d.ts.map +1 -1
- package/dist/cli/jarvis/instance-lock.js +132 -27
- package/dist/cli/jarvis/instance-lock.js.map +1 -1
- package/dist/cli/jarvis/learning.d.ts +6 -0
- package/dist/cli/jarvis/learning.d.ts.map +1 -1
- package/dist/cli/jarvis/learning.js +17 -3
- package/dist/cli/jarvis/learning.js.map +1 -1
- package/dist/cli/jarvis/notifications.d.ts.map +1 -1
- package/dist/cli/jarvis/notifications.js +75 -10
- package/dist/cli/jarvis/notifications.js.map +1 -1
- package/dist/cli/jarvis/onboarding.d.ts.map +1 -1
- package/dist/cli/jarvis/onboarding.js +32 -2
- package/dist/cli/jarvis/onboarding.js.map +1 -1
- package/dist/cli/jarvis/queue.d.ts +5 -0
- package/dist/cli/jarvis/queue.d.ts.map +1 -1
- package/dist/cli/jarvis/queue.js +23 -6
- package/dist/cli/jarvis/queue.js.map +1 -1
- package/dist/cli/jarvis/scheduler.d.ts +8 -0
- package/dist/cli/jarvis/scheduler.d.ts.map +1 -1
- package/dist/cli/jarvis/scheduler.js +32 -4
- package/dist/cli/jarvis/scheduler.js.map +1 -1
- package/dist/cli/jarvis/sentiment.d.ts +11 -0
- package/dist/cli/jarvis/sentiment.d.ts.map +1 -1
- package/dist/cli/jarvis/sentiment.js +40 -6
- package/dist/cli/jarvis/sentiment.js.map +1 -1
- package/dist/cli/jarvis/skills.d.ts +35 -0
- package/dist/cli/jarvis/skills.d.ts.map +1 -1
- package/dist/cli/jarvis/skills.js +144 -0
- package/dist/cli/jarvis/skills.js.map +1 -1
- package/dist/cli/jarvis/triggers.d.ts.map +1 -1
- package/dist/cli/jarvis/triggers.js +65 -9
- package/dist/cli/jarvis/triggers.js.map +1 -1
- package/dist/cli/jarvis/types.d.ts +10 -0
- package/dist/cli/jarvis/types.d.ts.map +1 -1
- package/dist/cli/jarvis/world-model.d.ts +4 -0
- package/dist/cli/jarvis/world-model.d.ts.map +1 -1
- package/dist/cli/jarvis/world-model.js +23 -1
- package/dist/cli/jarvis/world-model.js.map +1 -1
- package/dist/cli/providers/anthropic.d.ts +5 -1
- package/dist/cli/providers/anthropic.d.ts.map +1 -1
- package/dist/cli/providers/anthropic.js +133 -36
- package/dist/cli/providers/anthropic.js.map +1 -1
- package/dist/cli/providers/model-limits.d.ts +8 -0
- package/dist/cli/providers/model-limits.d.ts.map +1 -1
- package/dist/cli/providers/model-limits.js +42 -0
- package/dist/cli/providers/model-limits.js.map +1 -1
- package/dist/cli/providers/ollama.d.ts +2 -0
- package/dist/cli/providers/ollama.d.ts.map +1 -1
- package/dist/cli/providers/ollama.js +8 -0
- package/dist/cli/providers/ollama.js.map +1 -1
- package/dist/cli/providers/openai.d.ts +5 -1
- package/dist/cli/providers/openai.d.ts.map +1 -1
- package/dist/cli/providers/openai.js +66 -19
- package/dist/cli/providers/openai.js.map +1 -1
- package/dist/cli/providers/rate-limiter.d.ts +58 -20
- package/dist/cli/providers/rate-limiter.d.ts.map +1 -1
- package/dist/cli/providers/rate-limiter.js +212 -96
- package/dist/cli/providers/rate-limiter.js.map +1 -1
- package/dist/cli/providers/registry.d.ts.map +1 -1
- package/dist/cli/providers/registry.js +22 -13
- package/dist/cli/providers/registry.js.map +1 -1
- package/dist/cli/providers/types.d.ts +16 -5
- package/dist/cli/providers/types.d.ts.map +1 -1
- package/dist/spiral/cloud/content-extractor.d.ts.map +1 -1
- package/dist/spiral/cloud/content-extractor.js +6 -4
- package/dist/spiral/cloud/content-extractor.js.map +1 -1
- package/dist/spiral/cloud/search-provider.d.ts.map +1 -1
- package/dist/spiral/cloud/search-provider.js +7 -2
- package/dist/spiral/cloud/search-provider.js.map +1 -1
- package/dist/spiral/cloud/web-enricher.d.ts.map +1 -1
- package/dist/spiral/cloud/web-enricher.js +10 -2
- package/dist/spiral/cloud/web-enricher.js.map +1 -1
- package/dist/spiral/compression.d.ts +5 -2
- package/dist/spiral/compression.d.ts.map +1 -1
- package/dist/spiral/compression.js +23 -6
- package/dist/spiral/compression.js.map +1 -1
- package/dist/spiral/engine.d.ts +7 -1
- package/dist/spiral/engine.d.ts.map +1 -1
- package/dist/spiral/engine.js +83 -35
- package/dist/spiral/engine.js.map +1 -1
- package/dist/storage/database.d.ts.map +1 -1
- package/dist/storage/database.js +41 -0
- package/dist/storage/database.js.map +1 -1
- package/dist/storage/nodes.d.ts +6 -0
- package/dist/storage/nodes.d.ts.map +1 -1
- package/dist/storage/nodes.js +9 -0
- package/dist/storage/nodes.js.map +1 -1
- package/dist/storage/vectors.d.ts +1 -0
- package/dist/storage/vectors.d.ts.map +1 -1
- package/dist/storage/vectors.js +39 -7
- package/dist/storage/vectors.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,42 +1,114 @@
|
|
|
1
1
|
import Anthropic from '@anthropic-ai/sdk';
|
|
2
|
-
import {
|
|
3
|
-
import { getModelContextLength } from './model-limits.js';
|
|
2
|
+
import { RateLimiter, isRateLimitError, sleep, } from './rate-limiter.js';
|
|
3
|
+
import { getModelContextLength, getMaxOutputTokens } from './model-limits.js';
|
|
4
|
+
/**
|
|
5
|
+
* Mark the last user message with cache_control: ephemeral so Anthropic's
|
|
6
|
+
* prompt cache will checkpoint the full conversation up to that point.
|
|
7
|
+
* Mutates a *copy* of the messages array.
|
|
8
|
+
* FIX: PROVIDERS-M1 — prompt caching for conversation cache.
|
|
9
|
+
*/
|
|
10
|
+
function markLastUserMessageEphemeral(messages) {
|
|
11
|
+
if (messages.length === 0)
|
|
12
|
+
return messages;
|
|
13
|
+
// Find the last user message index
|
|
14
|
+
let lastUserIdx = -1;
|
|
15
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
16
|
+
if (messages[i].role === 'user') {
|
|
17
|
+
lastUserIdx = i;
|
|
18
|
+
break;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (lastUserIdx === -1)
|
|
22
|
+
return messages;
|
|
23
|
+
const target = messages[lastUserIdx];
|
|
24
|
+
const cloned = { ...target };
|
|
25
|
+
// Anthropic accepts content as either a string or a content-block array.
|
|
26
|
+
// We promote a string to a single text block with cache_control.
|
|
27
|
+
if (typeof target.content === 'string') {
|
|
28
|
+
cloned.content = [
|
|
29
|
+
{ type: 'text', text: target.content, cache_control: { type: 'ephemeral' } },
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
else if (Array.isArray(target.content)) {
|
|
33
|
+
const arr = [...target.content];
|
|
34
|
+
// Find the last block we're allowed to annotate — prefer text blocks,
|
|
35
|
+
// then tool_result, otherwise fall back to the last block.
|
|
36
|
+
let targetIdx = -1;
|
|
37
|
+
for (let i = arr.length - 1; i >= 0; i--) {
|
|
38
|
+
const t = arr[i]?.type;
|
|
39
|
+
if (t === 'text' || t === 'tool_result' || t === 'image') {
|
|
40
|
+
targetIdx = i;
|
|
41
|
+
break;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (targetIdx === -1)
|
|
45
|
+
targetIdx = arr.length - 1;
|
|
46
|
+
if (targetIdx >= 0) {
|
|
47
|
+
arr[targetIdx] = { ...arr[targetIdx], cache_control: { type: 'ephemeral' } };
|
|
48
|
+
}
|
|
49
|
+
cloned.content = arr;
|
|
50
|
+
}
|
|
51
|
+
const copy = [...messages];
|
|
52
|
+
copy[lastUserIdx] = cloned;
|
|
53
|
+
return copy;
|
|
54
|
+
}
|
|
4
55
|
export class AnthropicProvider {
|
|
5
56
|
name = 'anthropic';
|
|
6
57
|
model;
|
|
7
58
|
maxContextLength;
|
|
8
59
|
client;
|
|
60
|
+
// FIX: PROVIDERS-C2 — Each provider instance owns a RateLimiter.
|
|
61
|
+
_rateLimiter;
|
|
9
62
|
constructor(apiKey, model = 'claude-sonnet-4-6') {
|
|
10
63
|
this.model = model;
|
|
11
64
|
this.maxContextLength = getModelContextLength(model, 'anthropic');
|
|
12
65
|
this.client = new Anthropic({ apiKey });
|
|
66
|
+
this._rateLimiter = new RateLimiter('anthropic');
|
|
13
67
|
}
|
|
14
|
-
|
|
68
|
+
/** Access the provider's rate limiter (e.g. to register a wait listener). */
|
|
69
|
+
get rateLimiter() {
|
|
70
|
+
return this._rateLimiter;
|
|
71
|
+
}
|
|
72
|
+
async *stream(messages, systemPrompt, signal) {
|
|
15
73
|
let fullText = '';
|
|
16
74
|
try {
|
|
17
|
-
await waitIfNeeded();
|
|
75
|
+
await this._rateLimiter.waitIfNeeded(signal);
|
|
76
|
+
// FIX: PROVIDERS-M1 — prompt caching on system prompt for stream too.
|
|
77
|
+
const cachedSystem = [
|
|
78
|
+
{ type: 'text', text: systemPrompt, cache_control: { type: 'ephemeral' } },
|
|
79
|
+
];
|
|
80
|
+
const baseMessages = messages.map((m) => ({
|
|
81
|
+
role: m.role,
|
|
82
|
+
content: m.content,
|
|
83
|
+
}));
|
|
84
|
+
const cachedMessages = markLastUserMessageEphemeral(baseMessages);
|
|
85
|
+
// FIX: PROVIDERS-C1 — pass signal as 2nd arg for hard cancellation.
|
|
18
86
|
const stream = this.client.messages.stream({
|
|
19
87
|
model: this.model,
|
|
20
|
-
max_tokens:
|
|
21
|
-
system:
|
|
22
|
-
messages:
|
|
23
|
-
|
|
24
|
-
content: m.content,
|
|
25
|
-
})),
|
|
26
|
-
});
|
|
88
|
+
max_tokens: getMaxOutputTokens(this.model),
|
|
89
|
+
system: cachedSystem,
|
|
90
|
+
messages: cachedMessages,
|
|
91
|
+
}, signal ? { signal } : undefined);
|
|
27
92
|
for await (const event of stream) {
|
|
93
|
+
// FIX: PROVIDERS-C1 — bail out immediately if cancelled between events.
|
|
94
|
+
if (signal?.aborted)
|
|
95
|
+
return;
|
|
28
96
|
if (event.type === 'content_block_delta' &&
|
|
29
97
|
event.delta.type === 'text_delta') {
|
|
30
98
|
fullText += event.delta.text;
|
|
31
99
|
yield { type: 'text', content: event.delta.text };
|
|
100
|
+
if (signal?.aborted)
|
|
101
|
+
return;
|
|
32
102
|
}
|
|
33
103
|
}
|
|
34
|
-
reportSuccess();
|
|
104
|
+
this._rateLimiter.reportSuccess();
|
|
35
105
|
yield { type: 'done', content: fullText };
|
|
36
106
|
}
|
|
37
107
|
catch (err) {
|
|
108
|
+
if (signal?.aborted)
|
|
109
|
+
return;
|
|
38
110
|
if (isRateLimitError(err)) {
|
|
39
|
-
const waitMs = handleRateLimitError(err);
|
|
111
|
+
const waitMs = this._rateLimiter.handleRateLimitError(err);
|
|
40
112
|
yield { type: 'error', content: `Rate limited — waiting ${Math.ceil(waitMs / 1000)}s...` };
|
|
41
113
|
return;
|
|
42
114
|
}
|
|
@@ -47,43 +119,59 @@ export class AnthropicProvider {
|
|
|
47
119
|
}
|
|
48
120
|
}
|
|
49
121
|
async chatWithTools(messages, systemPrompt, tools, signal) {
|
|
50
|
-
const anthropicMessages = messages.map(m => ({
|
|
122
|
+
const anthropicMessages = messages.map((m) => ({
|
|
51
123
|
role: m.role,
|
|
52
124
|
content: m.content,
|
|
53
125
|
}));
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
126
|
+
// FIX: PROVIDERS-M1 — prompt caching on system + tools + last user message.
|
|
127
|
+
const cachedSystem = [
|
|
128
|
+
{ type: 'text', text: systemPrompt, cache_control: { type: 'ephemeral' } },
|
|
129
|
+
];
|
|
130
|
+
const anthropicTools = tools.map((t, i) => {
|
|
131
|
+
const base = {
|
|
132
|
+
name: t.name,
|
|
133
|
+
description: t.description,
|
|
134
|
+
input_schema: t.input_schema,
|
|
135
|
+
};
|
|
136
|
+
// Mark only the LAST tool ephemeral — cache_control on that marker
|
|
137
|
+
// caches the entire tool block up to that point.
|
|
138
|
+
return i === tools.length - 1
|
|
139
|
+
? { ...base, cache_control: { type: 'ephemeral' } }
|
|
140
|
+
: base;
|
|
141
|
+
});
|
|
142
|
+
const cachedMessages = markLastUserMessageEphemeral(anthropicMessages);
|
|
143
|
+
// FIX: PROVIDERS-C3 — provider OWNS rate-limit retry; the loop no longer retries 429s.
|
|
60
144
|
let response;
|
|
61
145
|
const maxRetries = 5;
|
|
62
146
|
for (let attempt = 0; attempt <= maxRetries; attempt++) {
|
|
63
|
-
await waitIfNeeded(signal);
|
|
147
|
+
await this._rateLimiter.waitIfNeeded(signal);
|
|
64
148
|
try {
|
|
65
149
|
response = await this.client.messages.create({
|
|
66
150
|
model: this.model,
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
151
|
+
// FIX: PROVIDERS-M2 — per-model output cap instead of hardcoded 8192.
|
|
152
|
+
max_tokens: getMaxOutputTokens(this.model),
|
|
153
|
+
system: cachedSystem,
|
|
154
|
+
messages: cachedMessages,
|
|
70
155
|
tools: anthropicTools,
|
|
71
156
|
}, signal ? { signal } : undefined);
|
|
72
|
-
reportSuccess();
|
|
157
|
+
this._rateLimiter.reportSuccess();
|
|
73
158
|
break;
|
|
74
159
|
}
|
|
75
160
|
catch (err) {
|
|
76
161
|
if (signal?.aborted)
|
|
77
162
|
throw err;
|
|
78
163
|
if (isRateLimitError(err)) {
|
|
79
|
-
const waitMs = handleRateLimitError(err);
|
|
164
|
+
const waitMs = this._rateLimiter.handleRateLimitError(err);
|
|
80
165
|
if (attempt < maxRetries) {
|
|
81
|
-
// Show wait and retry
|
|
82
166
|
process.stdout.write(`\r\x1b[K \u23F3 Rate limited \u2014 waiting ${Math.ceil(waitMs / 1000)}s (attempt ${attempt + 1}/${maxRetries})...`);
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}
|
|
167
|
+
// FIX: PROVIDERS-C3 — use signal-aware sleep helper.
|
|
168
|
+
try {
|
|
169
|
+
await sleep(waitMs, signal);
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
process.stdout.write('\r\x1b[K');
|
|
173
|
+
throw err;
|
|
174
|
+
}
|
|
87
175
|
process.stdout.write('\r\x1b[K');
|
|
88
176
|
continue;
|
|
89
177
|
}
|
|
@@ -93,7 +181,7 @@ export class AnthropicProvider {
|
|
|
93
181
|
}
|
|
94
182
|
if (!response)
|
|
95
183
|
throw new Error('Max retries exceeded');
|
|
96
|
-
const content = response.content.map(block => {
|
|
184
|
+
const content = response.content.map((block) => {
|
|
97
185
|
if (block.type === 'text') {
|
|
98
186
|
return { type: 'text', text: block.text };
|
|
99
187
|
}
|
|
@@ -107,13 +195,22 @@ export class AnthropicProvider {
|
|
|
107
195
|
}
|
|
108
196
|
return { type: 'text', text: '' };
|
|
109
197
|
});
|
|
198
|
+
// FIX: PROVIDERS-M1 — surface prompt-cache token counts to callers.
|
|
199
|
+
const rawUsage = response.usage;
|
|
200
|
+
const usage = {
|
|
201
|
+
input_tokens: response.usage.input_tokens,
|
|
202
|
+
output_tokens: response.usage.output_tokens,
|
|
203
|
+
};
|
|
204
|
+
if (typeof rawUsage?.cache_creation_input_tokens === 'number') {
|
|
205
|
+
usage.cache_creation_input_tokens = rawUsage.cache_creation_input_tokens;
|
|
206
|
+
}
|
|
207
|
+
if (typeof rawUsage?.cache_read_input_tokens === 'number') {
|
|
208
|
+
usage.cache_read_input_tokens = rawUsage.cache_read_input_tokens;
|
|
209
|
+
}
|
|
110
210
|
return {
|
|
111
211
|
content,
|
|
112
212
|
stop_reason: response.stop_reason,
|
|
113
|
-
usage
|
|
114
|
-
input_tokens: response.usage.input_tokens,
|
|
115
|
-
output_tokens: response.usage.output_tokens,
|
|
116
|
-
},
|
|
213
|
+
usage,
|
|
117
214
|
};
|
|
118
215
|
}
|
|
119
216
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/cli/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/cli/providers/anthropic.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,4 +13,12 @@ export declare function unregisterModelContextLength(model: string): void;
|
|
|
13
13
|
* Priority: custom registration > hardcoded > prefix match > provider default.
|
|
14
14
|
*/
|
|
15
15
|
export declare function getModelContextLength(model: string, provider?: string): number;
|
|
16
|
+
/**
|
|
17
|
+
* Per-model output-token caps used by chatWithTools.
|
|
18
|
+
* FIX: PROVIDERS-M2 — chatWithTools previously hardcoded max_tokens=8192 which
|
|
19
|
+
* caused truncation for reasoning models with larger output budgets.
|
|
20
|
+
*/
|
|
21
|
+
export declare const MAX_OUTPUT_TOKENS: Record<string, number>;
|
|
22
|
+
/** Get the recommended max output token budget for a model. */
|
|
23
|
+
export declare function getMaxOutputTokens(model: string): number;
|
|
16
24
|
//# sourceMappingURL=model-limits.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-limits.d.ts","sourceRoot":"","sources":["../../../src/cli/providers/model-limits.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"model-limits.d.ts","sourceRoot":"","sources":["../../../src/cli/providers/model-limits.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAmDH,2EAA2E;AAC3E,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAE9E;AAED,kDAAkD;AAClD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAuB9E;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAoBpD,CAAC;AAIF,+DAA+D;AAC/D,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CASxD"}
|
|
@@ -6,8 +6,12 @@
|
|
|
6
6
|
*/
|
|
7
7
|
const MODEL_CONTEXT_LENGTHS = {
|
|
8
8
|
// Anthropic
|
|
9
|
+
// FIX: PROVIDERS-M5 — Added opus-4-7 and 1M context variants.
|
|
10
|
+
'claude-opus-4-7': 200_000,
|
|
11
|
+
'claude-opus-4-7-1m': 1_000_000,
|
|
9
12
|
'claude-opus-4-6': 200_000,
|
|
10
13
|
'claude-sonnet-4-6': 200_000,
|
|
14
|
+
'claude-sonnet-4-6-1m': 1_000_000,
|
|
11
15
|
'claude-haiku-4-5-20251001': 200_000,
|
|
12
16
|
'claude-haiku-4-5': 200_000,
|
|
13
17
|
// OpenAI
|
|
@@ -21,6 +25,7 @@ const MODEL_CONTEXT_LENGTHS = {
|
|
|
21
25
|
'deepseek-chat': 64_000,
|
|
22
26
|
'deepseek-reasoner': 64_000,
|
|
23
27
|
// ZhipuAI (Z.AI)
|
|
28
|
+
'glm-5.1': 128_000,
|
|
24
29
|
'glm-5': 128_000,
|
|
25
30
|
'glm-5-code': 128_000,
|
|
26
31
|
'glm-4.7': 128_000,
|
|
@@ -74,4 +79,41 @@ export function getModelContextLength(model, provider) {
|
|
|
74
79
|
}
|
|
75
80
|
return DEFAULT_CONTEXT_LENGTH;
|
|
76
81
|
}
|
|
82
|
+
/**
|
|
83
|
+
* Per-model output-token caps used by chatWithTools.
|
|
84
|
+
* FIX: PROVIDERS-M2 — chatWithTools previously hardcoded max_tokens=8192 which
|
|
85
|
+
* caused truncation for reasoning models with larger output budgets.
|
|
86
|
+
*/
|
|
87
|
+
export const MAX_OUTPUT_TOKENS = {
|
|
88
|
+
// Anthropic
|
|
89
|
+
'claude-opus-4-7': 32_000,
|
|
90
|
+
'claude-opus-4-7-1m': 32_000,
|
|
91
|
+
'claude-opus-4-6': 16_000,
|
|
92
|
+
'claude-sonnet-4-6': 64_000,
|
|
93
|
+
'claude-sonnet-4-6-1m': 64_000,
|
|
94
|
+
'claude-haiku-4-5': 8_192,
|
|
95
|
+
'claude-haiku-4-5-20251001': 8_192,
|
|
96
|
+
// OpenAI / reasoning
|
|
97
|
+
'gpt-4o': 16_384,
|
|
98
|
+
'gpt-4o-mini': 16_384,
|
|
99
|
+
'o1': 100_000,
|
|
100
|
+
'o1-mini': 65_536,
|
|
101
|
+
'o3-mini': 100_000,
|
|
102
|
+
// DeepSeek
|
|
103
|
+
'deepseek-chat': 8_192,
|
|
104
|
+
'deepseek-reasoner': 8_192,
|
|
105
|
+
};
|
|
106
|
+
const DEFAULT_MAX_OUTPUT_TOKENS = 8_192;
|
|
107
|
+
/** Get the recommended max output token budget for a model. */
|
|
108
|
+
export function getMaxOutputTokens(model) {
|
|
109
|
+
if (MAX_OUTPUT_TOKENS[model] !== undefined) {
|
|
110
|
+
return MAX_OUTPUT_TOKENS[model];
|
|
111
|
+
}
|
|
112
|
+
// Prefix match (e.g. "claude-sonnet-4-6-20250514" → "claude-sonnet-4-6")
|
|
113
|
+
for (const [key, value] of Object.entries(MAX_OUTPUT_TOKENS)) {
|
|
114
|
+
if (model.startsWith(key))
|
|
115
|
+
return value;
|
|
116
|
+
}
|
|
117
|
+
return DEFAULT_MAX_OUTPUT_TOKENS;
|
|
118
|
+
}
|
|
77
119
|
//# sourceMappingURL=model-limits.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-limits.js","sourceRoot":"","sources":["../../../src/cli/providers/model-limits.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,qBAAqB,GAA2B;IACpD,YAAY;IACZ,iBAAiB,EAAE,OAAO;IAC1B,mBAAmB,EAAE,OAAO;IAC5B,2BAA2B,EAAE,OAAO;IACpC,kBAAkB,EAAE,OAAO;IAE3B,SAAS;IACT,QAAQ,EAAE,OAAO;IACjB,aAAa,EAAE,OAAO;IACtB,aAAa,EAAE,OAAO;IACtB,IAAI,EAAE,OAAO;IACb,SAAS,EAAE,OAAO;IAClB,SAAS,EAAE,OAAO;IAElB,WAAW;IACX,eAAe,EAAE,MAAM;IACvB,mBAAmB,EAAE,MAAM;IAE3B,iBAAiB;IACjB,OAAO,EAAE,OAAO;IAChB,YAAY,EAAE,OAAO;IACrB,SAAS,EAAE,OAAO;IAClB,gBAAgB,EAAE,OAAO;IACzB,eAAe,EAAE,OAAO;IACxB,SAAS,EAAE,OAAO;IAClB,SAAS,EAAE,OAAO;IAClB,WAAW,EAAE,OAAO;IACpB,aAAa,EAAE,KAAK;IACpB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,OAAO;IAExB,OAAO;IACP,yBAAyB,EAAE,OAAO;IAClC,sBAAsB,EAAE,OAAO;IAC/B,oBAAoB,EAAE,MAAM;CAC7B,CAAC;AAEF,MAAM,sBAAsB,GAAG,OAAO,CAAC;AACvC,MAAM,6BAA6B,GAAG,MAAM,CAAC;AAE7C,sEAAsE;AACtE,MAAM,sBAAsB,GAAwB,IAAI,GAAG,EAAE,CAAC;AAE9D,2EAA2E;AAC3E,MAAM,UAAU,0BAA0B,CAAC,KAAa,EAAE,MAAc;IACtE,sBAAsB,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,4BAA4B,CAAC,KAAa;IACxD,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAa,EAAE,QAAiB;IACpE,kDAAkD;IAClD,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IAExC,+BAA+B;IAC/B,IAAI,qBAAqB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,yEAAyE;IACzE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACjE,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,+BAA+B;IAC/B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC"}
|
|
1
|
+
{"version":3,"file":"model-limits.js","sourceRoot":"","sources":["../../../src/cli/providers/model-limits.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,8 @@ export declare function formatModelSize(bytes: number): string;
|
|
|
32
32
|
/**
|
|
33
33
|
* Pull (download) an Ollama model. Streams progress.
|
|
34
34
|
* Returns true if successful.
|
|
35
|
+
* FIX: PROVIDERS-m2 — Added 10-minute abort timeout so a stuck registry
|
|
36
|
+
* server can't leave the CLI hanging forever on large-model downloads.
|
|
35
37
|
*/
|
|
36
38
|
export declare function pullOllamaModel(modelName: string, onProgress?: (status: string, completed?: number, total?: number) => void): Promise<boolean>;
|
|
37
39
|
//# sourceMappingURL=ollama.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/cli/providers/ollama.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,+DAA+D;AAC/D,eAAO,MAAM,kBAAkB;;;;;GAqC9B,CAAC;AAEF,yCAAyC;AACzC,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAYxD;AAED,gCAAgC;AAChC,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAc/D;AAED,gDAAgD;AAChD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAc/D;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,oCAAoC;AACpC,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED
|
|
1
|
+
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/cli/providers/ollama.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,+DAA+D;AAC/D,eAAO,MAAM,kBAAkB;;;;;GAqC9B,CAAC;AAEF,yCAAyC;AACzC,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAYxD;AAED,gCAAgC;AAChC,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAc/D;AAED,gDAAgD;AAChD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAc/D;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,oCAAoC;AACpC,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKrD;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,GACxE,OAAO,CAAC,OAAO,CAAC,CAoDlB"}
|
|
@@ -105,13 +105,18 @@ export function formatModelSize(bytes) {
|
|
|
105
105
|
/**
|
|
106
106
|
* Pull (download) an Ollama model. Streams progress.
|
|
107
107
|
* Returns true if successful.
|
|
108
|
+
* FIX: PROVIDERS-m2 — Added 10-minute abort timeout so a stuck registry
|
|
109
|
+
* server can't leave the CLI hanging forever on large-model downloads.
|
|
108
110
|
*/
|
|
109
111
|
export async function pullOllamaModel(modelName, onProgress) {
|
|
112
|
+
const controller = new AbortController();
|
|
113
|
+
const timer = setTimeout(() => controller.abort(), 10 * 60 * 1000);
|
|
110
114
|
try {
|
|
111
115
|
const res = await fetch(`${OLLAMA_BASE}/api/pull`, {
|
|
112
116
|
method: 'POST',
|
|
113
117
|
headers: { 'Content-Type': 'application/json' },
|
|
114
118
|
body: JSON.stringify({ name: modelName, stream: true }),
|
|
119
|
+
signal: controller.signal,
|
|
115
120
|
});
|
|
116
121
|
if (!res.ok || !res.body)
|
|
117
122
|
return false;
|
|
@@ -147,5 +152,8 @@ export async function pullOllamaModel(modelName, onProgress) {
|
|
|
147
152
|
onProgress?.(`Error: ${err instanceof Error ? err.message : String(err)}`);
|
|
148
153
|
return false;
|
|
149
154
|
}
|
|
155
|
+
finally {
|
|
156
|
+
clearTimeout(timer);
|
|
157
|
+
}
|
|
150
158
|
}
|
|
151
159
|
//# sourceMappingURL=ollama.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../src/cli/providers/ollama.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../src/cli/providers/ollama.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import type { LLMProvider, ChatMessage, StreamEvent, ToolMessage, ToolDefinition, ToolResponse } from './types.js';
|
|
2
|
+
import { RateLimiter } from './rate-limiter.js';
|
|
2
3
|
export declare class OpenAIProvider implements LLMProvider {
|
|
3
4
|
readonly name: string;
|
|
4
5
|
readonly model: string;
|
|
5
6
|
readonly maxContextLength: number;
|
|
6
7
|
private client;
|
|
7
8
|
private systemRole;
|
|
9
|
+
private readonly _rateLimiter;
|
|
8
10
|
constructor(apiKey: string, model?: string, baseURL?: string, providerName?: string);
|
|
11
|
+
/** Access the provider's rate limiter. */
|
|
12
|
+
get rateLimiter(): RateLimiter;
|
|
9
13
|
/** Check if the current model is a reasoning model (DeepSeek-R1 etc.) */
|
|
10
14
|
private isReasonerModel;
|
|
11
|
-
stream(messages: ChatMessage[], systemPrompt: string): AsyncGenerator<StreamEvent>;
|
|
15
|
+
stream(messages: ChatMessage[], systemPrompt: string, signal?: AbortSignal): AsyncGenerator<StreamEvent>;
|
|
12
16
|
chatWithTools(messages: ToolMessage[], systemPrompt: string, tools: ToolDefinition[], signal?: AbortSignal): Promise<ToolResponse>;
|
|
13
17
|
}
|
|
14
18
|
//# sourceMappingURL=openai.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/cli/providers/openai.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/cli/providers/openai.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,WAAW,EACX,WAAW,EACX,cAAc,EACd,YAAY,EAEb,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,WAAW,EAIZ,MAAM,mBAAmB,CAAC;AAsB3B,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAyB;IAE3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;gBAE/B,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM;IAc7F,0CAA0C;IAC1C,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,yEAAyE;IACzE,OAAO,CAAC,eAAe;IAKhB,MAAM,CACX,QAAQ,EAAE,WAAW,EAAE,EACvB,YAAY,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,WAAW,GACnB,cAAc,CAAC,WAAW,CAAC;IAwCxB,aAAa,CACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,CAAC;CAgOzB"}
|