@dirgha/code 1.15.0 → 1.16.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/interactive.d.ts +5 -5
- package/dist/cli/interactive.js +206 -93
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +1 -0
- package/dist/cli/main.js.map +1 -1
- package/dist/kernel/agent-loop.d.ts +4 -3
- package/dist/kernel/agent-loop.js +75 -32
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/providers/openai-compat.d.ts +2 -2
- package/dist/providers/openai-compat.js +81 -56
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/tui/ink/App.js +28 -9
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +1 -0
- package/dist/tui/ink/use-event-projection.js +29 -3
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
* 4. Context transform (compaction, skill injection) is invoked once per
|
|
12
12
|
* turn before the provider call, never mid-stream.
|
|
13
13
|
*/
|
|
14
|
-
import type { Message, AgentResult, ToolDefinition, Provider, ToolExecutor, ApprovalBus, ErrorClassifier, AgentHooks } from
|
|
15
|
-
import type { EventStream } from
|
|
14
|
+
import type { Message, AgentResult, ToolDefinition, Provider, ToolExecutor, ApprovalBus, ErrorClassifier, AgentHooks } from "./types.js";
|
|
15
|
+
import type { EventStream } from "./event-stream.js";
|
|
16
16
|
export interface AgentLoopConfig {
|
|
17
17
|
sessionId: string;
|
|
18
18
|
model: string;
|
|
@@ -26,7 +26,7 @@ export interface AgentLoopConfig {
|
|
|
26
26
|
errorClassifier?: ErrorClassifier;
|
|
27
27
|
hooks?: AgentHooks;
|
|
28
28
|
contextTransform?: (messages: Message[]) => Promise<Message[]>;
|
|
29
|
-
toolConcurrency?:
|
|
29
|
+
toolConcurrency?: "serial" | "parallel";
|
|
30
30
|
signal?: AbortSignal;
|
|
31
31
|
/**
|
|
32
32
|
* When true, every approval-required tool call is auto-granted
|
|
@@ -36,5 +36,6 @@ export interface AgentLoopConfig {
|
|
|
36
36
|
* git mutations, etc.).
|
|
37
37
|
*/
|
|
38
38
|
autoApprove?: boolean;
|
|
39
|
+
costCalculator?: (input: number, output: number, cached: number) => number;
|
|
39
40
|
}
|
|
40
41
|
export declare function runAgentLoop(cfg: AgentLoopConfig): Promise<AgentResult>;
|
|
@@ -11,32 +11,41 @@
|
|
|
11
11
|
* 4. Context transform (compaction, skill injection) is invoked once per
|
|
12
12
|
* turn before the provider call, never mid-stream.
|
|
13
13
|
*/
|
|
14
|
-
import { assembleTurn, extractToolUses, appendToolResults } from
|
|
15
|
-
import { resolveModelForDispatch } from
|
|
16
|
-
import { findFailover } from
|
|
14
|
+
import { assembleTurn, extractToolUses, appendToolResults } from "./message.js";
|
|
15
|
+
import { resolveModelForDispatch } from "../providers/dispatch.js";
|
|
16
|
+
import { findFailover } from "../intelligence/prices.js";
|
|
17
17
|
export async function runAgentLoop(cfg) {
|
|
18
18
|
const events = cfg.events;
|
|
19
19
|
const history = [...cfg.messages];
|
|
20
|
-
const totals = {
|
|
21
|
-
|
|
20
|
+
const totals = {
|
|
21
|
+
inputTokens: 0,
|
|
22
|
+
outputTokens: 0,
|
|
23
|
+
cachedTokens: 0,
|
|
24
|
+
costUsd: 0,
|
|
25
|
+
};
|
|
26
|
+
let stopReason = "end_turn";
|
|
22
27
|
let turnCount = 0;
|
|
23
|
-
events.emit({
|
|
28
|
+
events.emit({
|
|
29
|
+
type: "agent_start",
|
|
30
|
+
sessionId: cfg.sessionId,
|
|
31
|
+
model: cfg.model,
|
|
32
|
+
});
|
|
24
33
|
try {
|
|
25
34
|
for (let turnIndex = 0; turnIndex < cfg.maxTurns; turnIndex++) {
|
|
26
35
|
if (cfg.signal?.aborted) {
|
|
27
|
-
stopReason =
|
|
36
|
+
stopReason = "aborted";
|
|
28
37
|
break;
|
|
29
38
|
}
|
|
30
39
|
if (cfg.hooks?.beforeTurn) {
|
|
31
40
|
const decision = await cfg.hooks.beforeTurn(turnIndex, history);
|
|
32
|
-
if (decision ===
|
|
33
|
-
stopReason =
|
|
41
|
+
if (decision === "abort") {
|
|
42
|
+
stopReason = "aborted";
|
|
34
43
|
break;
|
|
35
44
|
}
|
|
36
45
|
}
|
|
37
46
|
turnCount = turnIndex + 1;
|
|
38
47
|
const turnId = `t${turnIndex}-${Date.now().toString(36)}`;
|
|
39
|
-
events.emit({ type:
|
|
48
|
+
events.emit({ type: "turn_start", turnId, turnIndex });
|
|
40
49
|
const messagesForCall = cfg.contextTransform
|
|
41
50
|
? await cfg.contextTransform(history)
|
|
42
51
|
: history;
|
|
@@ -51,17 +60,21 @@ export async function runAgentLoop(cfg) {
|
|
|
51
60
|
})) {
|
|
52
61
|
streamEvents.push(ev);
|
|
53
62
|
events.emit(ev);
|
|
63
|
+
if (cfg.signal?.aborted)
|
|
64
|
+
break;
|
|
54
65
|
}
|
|
55
66
|
}
|
|
56
67
|
catch (err) {
|
|
57
68
|
// An AbortError mid-stream is a clean cancellation, not a
|
|
58
69
|
// failure. Distinguish so callers (and `dirgha audit`) see
|
|
59
70
|
// `stopReason: 'aborted'` instead of misleading 'error'.
|
|
60
|
-
const isAbort = (
|
|
61
|
-
|
|
71
|
+
const isAbort = (err instanceof Error &&
|
|
72
|
+
(err.name === "AbortError" ||
|
|
73
|
+
/aborted|abort/i.test(err.message))) ||
|
|
74
|
+
cfg.signal?.aborted === true;
|
|
62
75
|
if (isAbort) {
|
|
63
|
-
stopReason =
|
|
64
|
-
events.emit({ type:
|
|
76
|
+
stopReason = "aborted";
|
|
77
|
+
events.emit({ type: "turn_end", turnId, stopReason });
|
|
65
78
|
break;
|
|
66
79
|
}
|
|
67
80
|
const classified = cfg.errorClassifier?.classify(err, cfg.provider.id, cfg.model);
|
|
@@ -74,43 +87,57 @@ export async function runAgentLoop(cfg) {
|
|
|
74
87
|
const looksFixable = /not a valid model id|deprecated|model_not_found|rate.?limit|429\b|5\d\d\b|bad.?gateway|upstream/i.test(errMsg);
|
|
75
88
|
const failover = looksFixable ? findFailover(cfg.model) : undefined;
|
|
76
89
|
events.emit({
|
|
77
|
-
type:
|
|
90
|
+
type: "error",
|
|
78
91
|
message: errMsg,
|
|
79
92
|
reason: classified?.reason,
|
|
80
93
|
retryable: classified?.retryable ?? false,
|
|
81
94
|
...(failover !== undefined ? { failoverModel: failover } : {}),
|
|
82
95
|
});
|
|
83
|
-
stopReason =
|
|
84
|
-
events.emit({ type:
|
|
96
|
+
stopReason = "error";
|
|
97
|
+
events.emit({ type: "turn_end", turnId, stopReason });
|
|
85
98
|
break;
|
|
86
99
|
}
|
|
87
100
|
const assembled = assembleTurn(streamEvents);
|
|
88
101
|
totals.inputTokens += assembled.inputTokens;
|
|
89
102
|
totals.outputTokens += assembled.outputTokens;
|
|
90
103
|
totals.cachedTokens += assembled.cachedTokens;
|
|
104
|
+
if (cfg.costCalculator) {
|
|
105
|
+
totals.costUsd += cfg.costCalculator(assembled.inputTokens, assembled.outputTokens, assembled.cachedTokens);
|
|
106
|
+
}
|
|
91
107
|
history.push(assembled.message);
|
|
92
108
|
const toolUses = extractToolUses(assembled.message);
|
|
93
109
|
if (toolUses.length === 0) {
|
|
94
|
-
events.emit({ type:
|
|
110
|
+
events.emit({ type: "turn_end", turnId, stopReason: "end_turn" });
|
|
95
111
|
await cfg.hooks?.afterTurn?.(turnIndex, totals);
|
|
96
112
|
break;
|
|
97
113
|
}
|
|
98
114
|
const toolResults = await executeToolCalls(toolUses, cfg, events);
|
|
99
|
-
const appended = appendToolResults(history, toolResults.map(r => ({
|
|
115
|
+
const appended = appendToolResults(history, toolResults.map((r) => ({
|
|
100
116
|
toolUseId: r.call.id,
|
|
101
117
|
content: r.result.content,
|
|
102
118
|
isError: r.result.isError,
|
|
103
119
|
})));
|
|
104
120
|
history.length = 0;
|
|
105
121
|
history.push(...appended);
|
|
106
|
-
events.emit({ type:
|
|
122
|
+
events.emit({ type: "turn_end", turnId, stopReason: "tool_use" });
|
|
107
123
|
await cfg.hooks?.afterTurn?.(turnIndex, totals);
|
|
108
124
|
}
|
|
109
125
|
}
|
|
110
126
|
finally {
|
|
111
|
-
events.emit({
|
|
127
|
+
events.emit({
|
|
128
|
+
type: "agent_end",
|
|
129
|
+
sessionId: cfg.sessionId,
|
|
130
|
+
stopReason,
|
|
131
|
+
usage: totals,
|
|
132
|
+
});
|
|
112
133
|
}
|
|
113
|
-
return {
|
|
134
|
+
return {
|
|
135
|
+
messages: history,
|
|
136
|
+
usage: totals,
|
|
137
|
+
stopReason,
|
|
138
|
+
turnCount,
|
|
139
|
+
sessionId: cfg.sessionId,
|
|
140
|
+
};
|
|
114
141
|
}
|
|
115
142
|
async function executeToolCalls(toolUses, cfg, events) {
|
|
116
143
|
const run = async (call) => {
|
|
@@ -125,29 +152,45 @@ async function executeToolCalls(toolUses, cfg, events) {
|
|
|
125
152
|
input = decision.replaceInput;
|
|
126
153
|
}
|
|
127
154
|
}
|
|
128
|
-
if (cfg.approvalBus?.requiresApproval(call.name, input) &&
|
|
155
|
+
if (cfg.approvalBus?.requiresApproval(call.name, input) &&
|
|
156
|
+
!cfg.autoApprove) {
|
|
129
157
|
const decision = await cfg.approvalBus.request({
|
|
130
158
|
id: call.id,
|
|
131
159
|
tool: call.name,
|
|
132
160
|
summary: `${call.name}: ${truncateForSummary(input)}`,
|
|
133
161
|
});
|
|
134
|
-
if (decision ===
|
|
135
|
-
return {
|
|
162
|
+
if (decision === "deny" || decision === "deny_always") {
|
|
163
|
+
return {
|
|
164
|
+
call,
|
|
165
|
+
result: {
|
|
166
|
+
content: `Tool call ${call.name} denied by user.`,
|
|
167
|
+
isError: true,
|
|
168
|
+
},
|
|
169
|
+
};
|
|
136
170
|
}
|
|
137
171
|
}
|
|
138
|
-
events.emit({
|
|
172
|
+
events.emit({
|
|
173
|
+
type: "tool_exec_start",
|
|
174
|
+
id: call.id,
|
|
175
|
+
name: call.name,
|
|
176
|
+
input,
|
|
177
|
+
});
|
|
139
178
|
const started = Date.now();
|
|
140
179
|
let result;
|
|
141
180
|
try {
|
|
142
181
|
result = await cfg.toolExecutor.execute({ ...call, input }, cfg.signal ?? defaultSignal());
|
|
143
182
|
}
|
|
144
183
|
catch (err) {
|
|
145
|
-
result = {
|
|
184
|
+
result = {
|
|
185
|
+
content: `Tool execution failed: ${String(err)}`,
|
|
186
|
+
isError: true,
|
|
187
|
+
};
|
|
146
188
|
}
|
|
147
189
|
const durationMs = Date.now() - started;
|
|
148
|
-
result =
|
|
190
|
+
result =
|
|
191
|
+
(await cfg.hooks?.afterToolCall?.({ ...call, input }, result)) ?? result;
|
|
149
192
|
events.emit({
|
|
150
|
-
type:
|
|
193
|
+
type: "tool_exec_end",
|
|
151
194
|
id: call.id,
|
|
152
195
|
output: result.content,
|
|
153
196
|
isError: result.isError,
|
|
@@ -155,7 +198,7 @@ async function executeToolCalls(toolUses, cfg, events) {
|
|
|
155
198
|
});
|
|
156
199
|
return { call: { ...call, input }, result };
|
|
157
200
|
};
|
|
158
|
-
if (cfg.toolConcurrency ===
|
|
201
|
+
if (cfg.toolConcurrency === "parallel" && toolUses.length > 1) {
|
|
159
202
|
return Promise.all(toolUses.map(run));
|
|
160
203
|
}
|
|
161
204
|
const out = [];
|
|
@@ -164,8 +207,8 @@ async function executeToolCalls(toolUses, cfg, events) {
|
|
|
164
207
|
return out;
|
|
165
208
|
}
|
|
166
209
|
function truncateForSummary(input, max = 160) {
|
|
167
|
-
const s = typeof input ===
|
|
168
|
-
return s.length <= max ? s : s.slice(0, max - 1) +
|
|
210
|
+
const s = typeof input === "string" ? input : JSON.stringify(input);
|
|
211
|
+
return s.length <= max ? s : s.slice(0, max - 1) + "…";
|
|
169
212
|
}
|
|
170
213
|
function defaultSignal() {
|
|
171
214
|
return new AbortController().signal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../src/kernel/agent-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAkBH,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../src/kernel/agent-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* OpenAI-compatible dialect use this helper; they differ only in base
|
|
9
9
|
* URL, model roster, and per-model request shaping.
|
|
10
10
|
*/
|
|
11
|
-
import type { AgentEvent, Message, ToolDefinition } from
|
|
11
|
+
import type { AgentEvent, Message, ToolDefinition } from "../kernel/types.js";
|
|
12
12
|
export interface OpenAICompatCallOptions {
|
|
13
13
|
providerName: string;
|
|
14
14
|
endpoint: string;
|
|
@@ -18,7 +18,7 @@ export interface OpenAICompatCallOptions {
|
|
|
18
18
|
tools?: ToolDefinition[];
|
|
19
19
|
temperature?: number;
|
|
20
20
|
maxTokens?: number;
|
|
21
|
-
toolChoice?:
|
|
21
|
+
toolChoice?: "auto" | "required" | "none";
|
|
22
22
|
extraHeaders?: Record<string, string>;
|
|
23
23
|
extraBody?: Record<string, unknown>;
|
|
24
24
|
signal?: AbortSignal;
|
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
* OpenAI-compatible dialect use this helper; they differ only in base
|
|
9
9
|
* URL, model roster, and per-model request shaping.
|
|
10
10
|
*/
|
|
11
|
-
import { streamSSE } from
|
|
12
|
-
import { ProviderError } from
|
|
13
|
-
import { repairJSON } from
|
|
11
|
+
import { streamSSE } from "./http.js";
|
|
12
|
+
import { ProviderError } from "./iface.js";
|
|
13
|
+
import { repairJSON } from "../utils/json-repair.js";
|
|
14
14
|
export async function* streamChatCompletions(opts) {
|
|
15
15
|
const body = {
|
|
16
16
|
model: opts.model,
|
|
@@ -24,7 +24,7 @@ export async function* streamChatCompletions(opts) {
|
|
|
24
24
|
body.max_tokens = opts.maxTokens;
|
|
25
25
|
if (opts.tools && opts.tools.length > 0) {
|
|
26
26
|
body.tools = toOpenAITools(opts.tools, opts.sanitizeToolDescriptions);
|
|
27
|
-
if (opts.toolChoice && opts.toolChoice !==
|
|
27
|
+
if (opts.toolChoice && opts.toolChoice !== "auto")
|
|
28
28
|
body.tool_choice = opts.toolChoice;
|
|
29
29
|
}
|
|
30
30
|
if (opts.extraBody)
|
|
@@ -39,7 +39,7 @@ export async function* streamChatCompletions(opts) {
|
|
|
39
39
|
signal: opts.signal,
|
|
40
40
|
timeoutMs: opts.timeoutMs,
|
|
41
41
|
})) {
|
|
42
|
-
if (payload ===
|
|
42
|
+
if (payload === "[DONE]")
|
|
43
43
|
break;
|
|
44
44
|
let chunk;
|
|
45
45
|
try {
|
|
@@ -58,52 +58,63 @@ export async function* streamChatCompletions(opts) {
|
|
|
58
58
|
function toOpenAIMessages(messages) {
|
|
59
59
|
const out = [];
|
|
60
60
|
for (const msg of messages) {
|
|
61
|
-
if (msg.role ===
|
|
61
|
+
if (msg.role === "tool")
|
|
62
62
|
continue;
|
|
63
|
-
if (typeof msg.content ===
|
|
64
|
-
out.push({
|
|
63
|
+
if (typeof msg.content === "string") {
|
|
64
|
+
out.push({
|
|
65
|
+
role: msg.role === "assistant" ? "assistant" : msg.role,
|
|
66
|
+
content: msg.content,
|
|
67
|
+
});
|
|
65
68
|
continue;
|
|
66
69
|
}
|
|
67
70
|
const parts = msg.content;
|
|
68
|
-
if (msg.role ===
|
|
71
|
+
if (msg.role === "assistant") {
|
|
69
72
|
const texts = [];
|
|
70
73
|
const thinkings = [];
|
|
71
74
|
const toolCalls = [];
|
|
72
75
|
for (const p of parts) {
|
|
73
|
-
if (p.type ===
|
|
76
|
+
if (p.type === "text")
|
|
74
77
|
texts.push(p.text);
|
|
75
|
-
else if (p.type ===
|
|
78
|
+
else if (p.type === "thinking")
|
|
76
79
|
thinkings.push(p.text);
|
|
77
|
-
else if (p.type ===
|
|
80
|
+
else if (p.type === "tool_use") {
|
|
78
81
|
toolCalls.push({
|
|
79
82
|
id: p.id,
|
|
80
|
-
type:
|
|
81
|
-
function: {
|
|
83
|
+
type: "function",
|
|
84
|
+
function: {
|
|
85
|
+
name: p.name,
|
|
86
|
+
arguments: JSON.stringify(p.input ?? {}),
|
|
87
|
+
},
|
|
82
88
|
});
|
|
83
89
|
}
|
|
84
90
|
}
|
|
85
91
|
const assistantMsg = {
|
|
86
|
-
role:
|
|
87
|
-
content: texts.length > 0 ? texts.join(
|
|
92
|
+
role: "assistant",
|
|
93
|
+
content: texts.length > 0 ? texts.join("") : null,
|
|
88
94
|
...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {}),
|
|
89
95
|
// DeepSeek / OpenAI-compat thinking models require reasoning_content
|
|
90
96
|
// to be echoed back verbatim in multi-turn — omitting it causes 400.
|
|
91
|
-
...(thinkings.length > 0
|
|
97
|
+
...(thinkings.length > 0
|
|
98
|
+
? { reasoning_content: thinkings.join("") }
|
|
99
|
+
: {}),
|
|
92
100
|
};
|
|
93
101
|
out.push(assistantMsg);
|
|
94
102
|
continue;
|
|
95
103
|
}
|
|
96
|
-
const results = parts.filter(p => p.type ===
|
|
104
|
+
const results = parts.filter((p) => p.type === "tool_result");
|
|
97
105
|
const texts = parts
|
|
98
|
-
.filter((p) => p.type ===
|
|
99
|
-
.map(p => p.text);
|
|
106
|
+
.filter((p) => p.type === "text")
|
|
107
|
+
.map((p) => p.text);
|
|
100
108
|
if (texts.length > 0)
|
|
101
|
-
out.push({
|
|
109
|
+
out.push({
|
|
110
|
+
role: msg.role === "system" ? "system" : "user",
|
|
111
|
+
content: texts.join(""),
|
|
112
|
+
});
|
|
102
113
|
for (const r of results) {
|
|
103
|
-
if (r.type !==
|
|
114
|
+
if (r.type !== "tool_result")
|
|
104
115
|
continue;
|
|
105
116
|
out.push({
|
|
106
|
-
role:
|
|
117
|
+
role: "tool",
|
|
107
118
|
tool_call_id: r.toolUseId,
|
|
108
119
|
content: r.content,
|
|
109
120
|
});
|
|
@@ -112,12 +123,12 @@ function toOpenAIMessages(messages) {
|
|
|
112
123
|
return out;
|
|
113
124
|
}
|
|
114
125
|
function toOpenAITools(tools, sanitize) {
|
|
115
|
-
return tools.map(t => ({
|
|
116
|
-
type:
|
|
126
|
+
return tools.map((t) => ({
|
|
127
|
+
type: "function",
|
|
117
128
|
function: {
|
|
118
129
|
name: t.name,
|
|
119
130
|
description: sanitize ? sanitize(t.description) : t.description,
|
|
120
|
-
parameters: t.inputSchema ?? { type:
|
|
131
|
+
parameters: t.inputSchema ?? { type: "object", properties: {} },
|
|
121
132
|
},
|
|
122
133
|
}));
|
|
123
134
|
}
|
|
@@ -132,13 +143,13 @@ class StreamState {
|
|
|
132
143
|
// chunks. Once we see the open tag, accumulate until the close tag
|
|
133
144
|
// arrives. Anything before/after is text.
|
|
134
145
|
inThinkBlock = false;
|
|
135
|
-
thinkBuffer =
|
|
146
|
+
thinkBuffer = "";
|
|
136
147
|
static THINK_OPEN_RE = /<(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
137
148
|
static THINK_CLOSE_RE = /<\/(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
138
149
|
/** Split a content delta into text + thinking pieces, honoring open <think> blocks across chunks. */
|
|
139
150
|
routeContent(input) {
|
|
140
|
-
let text =
|
|
141
|
-
let thinking =
|
|
151
|
+
let text = "";
|
|
152
|
+
let thinking = "";
|
|
142
153
|
let s = input;
|
|
143
154
|
while (s.length > 0) {
|
|
144
155
|
if (this.inThinkBlock) {
|
|
@@ -146,11 +157,11 @@ class StreamState {
|
|
|
146
157
|
if (!close || close.index === undefined) {
|
|
147
158
|
thinking += s;
|
|
148
159
|
this.thinkBuffer += s;
|
|
149
|
-
s =
|
|
160
|
+
s = "";
|
|
150
161
|
break;
|
|
151
162
|
}
|
|
152
163
|
thinking += s.slice(0, close.index);
|
|
153
|
-
this.thinkBuffer =
|
|
164
|
+
this.thinkBuffer = "";
|
|
154
165
|
this.inThinkBlock = false;
|
|
155
166
|
s = s.slice(close.index + close[0].length);
|
|
156
167
|
}
|
|
@@ -158,7 +169,7 @@ class StreamState {
|
|
|
158
169
|
const open = s.match(StreamState.THINK_OPEN_RE);
|
|
159
170
|
if (!open || open.index === undefined) {
|
|
160
171
|
text += s;
|
|
161
|
-
s =
|
|
172
|
+
s = "";
|
|
162
173
|
break;
|
|
163
174
|
}
|
|
164
175
|
text += s.slice(0, open.index);
|
|
@@ -184,27 +195,41 @@ class StreamState {
|
|
|
184
195
|
// the `reasoning` channel and dirgha sees zero text → empty reply.
|
|
185
196
|
if (this.includeThinking) {
|
|
186
197
|
const d = delta;
|
|
187
|
-
const r = (typeof d.reasoning_content ===
|
|
188
|
-
|
|
189
|
-
|
|
198
|
+
const r = (typeof d.reasoning_content === "string" && d.reasoning_content) ||
|
|
199
|
+
(typeof d.reasoning === "string" && d.reasoning) ||
|
|
200
|
+
"";
|
|
190
201
|
if (r.length > 0) {
|
|
191
202
|
if (!this.thinkingOpen) {
|
|
192
|
-
yield { type:
|
|
203
|
+
yield { type: "thinking_start" };
|
|
193
204
|
this.thinkingOpen = true;
|
|
194
205
|
}
|
|
195
|
-
yield { type:
|
|
206
|
+
yield { type: "thinking_delta", delta: r };
|
|
196
207
|
}
|
|
197
208
|
}
|
|
198
|
-
if (typeof delta.content ===
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
this.thinkingOpen
|
|
209
|
+
if (typeof delta.content === "string" && delta.content.length > 0) {
|
|
210
|
+
const routed = this.routeContent(delta.content);
|
|
211
|
+
if (routed.text.length > 0) {
|
|
212
|
+
if (this.thinkingOpen) {
|
|
213
|
+
yield { type: "thinking_end" };
|
|
214
|
+
this.thinkingOpen = false;
|
|
215
|
+
}
|
|
216
|
+
if (!this.textOpen) {
|
|
217
|
+
yield { type: "text_start" };
|
|
218
|
+
this.textOpen = true;
|
|
219
|
+
}
|
|
220
|
+
yield { type: "text_delta", delta: routed.text };
|
|
202
221
|
}
|
|
203
|
-
if (
|
|
204
|
-
|
|
205
|
-
|
|
222
|
+
if (routed.thinking.length > 0) {
|
|
223
|
+
if (this.textOpen) {
|
|
224
|
+
yield { type: "text_end" };
|
|
225
|
+
this.textOpen = false;
|
|
226
|
+
}
|
|
227
|
+
if (!this.thinkingOpen) {
|
|
228
|
+
yield { type: "thinking_start" };
|
|
229
|
+
this.thinkingOpen = true;
|
|
230
|
+
}
|
|
231
|
+
yield { type: "thinking_delta", delta: routed.thinking };
|
|
206
232
|
}
|
|
207
|
-
yield { type: 'text_delta', delta: delta.content };
|
|
208
233
|
}
|
|
209
234
|
if (delta.tool_calls) {
|
|
210
235
|
for (const tc of delta.tool_calls) {
|
|
@@ -218,26 +243,26 @@ class StreamState {
|
|
|
218
243
|
continue;
|
|
219
244
|
let entry = this.toolOpen.get(id);
|
|
220
245
|
if (!entry) {
|
|
221
|
-
const name = tc.function?.name ??
|
|
222
|
-
entry = { name, bufferedJson:
|
|
246
|
+
const name = tc.function?.name ?? "";
|
|
247
|
+
entry = { name, bufferedJson: "" };
|
|
223
248
|
this.toolOpen.set(id, entry);
|
|
224
249
|
if (this.textOpen) {
|
|
225
|
-
yield { type:
|
|
250
|
+
yield { type: "text_end" };
|
|
226
251
|
this.textOpen = false;
|
|
227
252
|
}
|
|
228
253
|
if (this.thinkingOpen) {
|
|
229
|
-
yield { type:
|
|
254
|
+
yield { type: "thinking_end" };
|
|
230
255
|
this.thinkingOpen = false;
|
|
231
256
|
}
|
|
232
|
-
yield { type:
|
|
257
|
+
yield { type: "toolcall_start", id, name };
|
|
233
258
|
}
|
|
234
259
|
else if (!entry.name && tc.function?.name) {
|
|
235
260
|
entry.name = tc.function.name;
|
|
236
261
|
}
|
|
237
|
-
const argsDelta = tc.function?.arguments ??
|
|
262
|
+
const argsDelta = tc.function?.arguments ?? "";
|
|
238
263
|
if (argsDelta.length > 0) {
|
|
239
264
|
entry.bufferedJson += argsDelta;
|
|
240
|
-
yield { type:
|
|
265
|
+
yield { type: "toolcall_delta", id, deltaJson: argsDelta };
|
|
241
266
|
}
|
|
242
267
|
}
|
|
243
268
|
}
|
|
@@ -251,16 +276,16 @@ class StreamState {
|
|
|
251
276
|
}
|
|
252
277
|
*closeOpen() {
|
|
253
278
|
if (this.textOpen) {
|
|
254
|
-
yield { type:
|
|
279
|
+
yield { type: "text_end" };
|
|
255
280
|
this.textOpen = false;
|
|
256
281
|
}
|
|
257
282
|
if (this.thinkingOpen) {
|
|
258
|
-
yield { type:
|
|
283
|
+
yield { type: "thinking_end" };
|
|
259
284
|
this.thinkingOpen = false;
|
|
260
285
|
}
|
|
261
286
|
for (const [id, entry] of this.toolOpen) {
|
|
262
287
|
const input = parseArguments(entry.bufferedJson);
|
|
263
|
-
yield { type:
|
|
288
|
+
yield { type: "toolcall_end", id, input };
|
|
264
289
|
}
|
|
265
290
|
this.toolOpen.clear();
|
|
266
291
|
}
|
|
@@ -272,7 +297,7 @@ class StreamState {
|
|
|
272
297
|
return;
|
|
273
298
|
this.usageEmitted = true;
|
|
274
299
|
yield {
|
|
275
|
-
type:
|
|
300
|
+
type: "usage",
|
|
276
301
|
inputTokens: usage.prompt_tokens ?? 0,
|
|
277
302
|
outputTokens: usage.completion_tokens ?? 0,
|
|
278
303
|
cachedTokens: usage.prompt_tokens_details?.cached_tokens ?? 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|