@office-ai/aioncli-core 0.30.1 → 0.30.3
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/docs/extension.md +1 -1
- package/dist/src/agents/cli-help-agent.d.ts +2 -2
- package/dist/src/code_assist/oauth2.d.ts +1 -1
- package/dist/src/code_assist/types.d.ts +26 -26
- package/dist/src/core/bedrockContentGenerator.d.ts +6 -0
- package/dist/src/core/bedrockContentGenerator.js +24 -11
- package/dist/src/core/bedrockContentGenerator.js.map +1 -1
- package/dist/src/core/openaiContentGenerator.d.ts +7 -7
- package/dist/src/core/openaiContentGenerator.js +34 -20
- package/dist/src/core/openaiContentGenerator.js.map +1 -1
- package/dist/src/core/openaiContentGenerator.test.js +5 -1
- package/dist/src/core/openaiContentGenerator.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +1 -1
- package/dist/src/generated/git-commit.js +1 -1
- package/dist/src/ide/types.d.ts +12 -12
- package/dist/src/services/trackerTypes.d.ts +4 -4
- package/dist/src/utils/checkpointUtils.d.ts +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/docs/extension.md
CHANGED
|
@@ -106,7 +106,7 @@ The `gemini-extension.json` file contains the configuration for the extension. T
|
|
|
106
106
|
|
|
107
107
|
- `name`: The name of the extension. This is used to uniquely identify the extension and for conflict resolution when extension commands have the same name as user or project commands. The name should be lowercase or numbers and use dashes instead of underscores or spaces. This is how users will refer to your extension in the CLI. Note that we expect this name to match the extension directory name.
|
|
108
108
|
- `version`: The version of the extension.
|
|
109
|
-
- `mcpServers`: A map of MCP servers to configure. The key is the name of the server, and the value is the server configuration. These servers will be loaded on startup just like MCP servers configured in a [`settings.json` file](./cli/
|
|
109
|
+
- `mcpServers`: A map of MCP servers to configure. The key is the name of the server, and the value is the server configuration. These servers will be loaded on startup just like MCP servers configured in a [`settings.json` file](./cli/settings.md). If both an extension and a `settings.json` file configure an MCP server with the same name, the server defined in the `settings.json` file takes precedence.
|
|
110
110
|
- Note that all MCP server configuration options are supported except for `trust`.
|
|
111
111
|
- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the extension directory. If this property is not used but a `GEMINI.md` file is present in your extension directory, then that file will be loaded.
|
|
112
112
|
- `excludeTools`: An array of tool names to exclude from the model. You can also specify command-specific restrictions for tools that support it, like the `run_shell_command` tool. For example, `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf` command. Note that this differs from the MCP server `excludeTools` functionality, which can be listed in the MCP server config.
|
|
@@ -10,11 +10,11 @@ declare const CliHelpReportSchema: z.ZodObject<{
|
|
|
10
10
|
answer: z.ZodString;
|
|
11
11
|
sources: z.ZodArray<z.ZodString, "many">;
|
|
12
12
|
}, "strip", z.ZodTypeAny, {
|
|
13
|
-
answer: string;
|
|
14
13
|
sources: string[];
|
|
15
|
-
}, {
|
|
16
14
|
answer: string;
|
|
15
|
+
}, {
|
|
17
16
|
sources: string[];
|
|
17
|
+
answer: string;
|
|
18
18
|
}>;
|
|
19
19
|
/**
|
|
20
20
|
* An agent specialized in answering questions about Gemini CLI itself,
|
|
@@ -7,7 +7,7 @@ import type { AuthClient } from 'google-auth-library';
|
|
|
7
7
|
import { EventEmitter } from 'node:events';
|
|
8
8
|
import type { Config } from '../config/config.js';
|
|
9
9
|
import { AuthType } from '../core/contentGenerator.js';
|
|
10
|
-
export declare const authEvents: EventEmitter<
|
|
10
|
+
export declare const authEvents: EventEmitter<[never]>;
|
|
11
11
|
/**
|
|
12
12
|
* An Authentication URL for updating the credentials of a Oauth2Client
|
|
13
13
|
* as well as a promise that will resolve when the credentials have
|
|
@@ -255,33 +255,33 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
|
|
|
255
255
|
includeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
256
256
|
excludeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
257
257
|
}, "strip", z.ZodTypeAny, {
|
|
258
|
-
url?: string | undefined;
|
|
259
258
|
type?: "http" | "sse" | undefined;
|
|
259
|
+
url?: string | undefined;
|
|
260
|
+
includeTools?: string[] | undefined;
|
|
260
261
|
excludeTools?: string[] | undefined;
|
|
261
262
|
trust?: boolean | undefined;
|
|
262
|
-
includeTools?: string[] | undefined;
|
|
263
263
|
}, {
|
|
264
|
-
url?: string | undefined;
|
|
265
264
|
type?: "http" | "sse" | undefined;
|
|
265
|
+
url?: string | undefined;
|
|
266
|
+
includeTools?: string[] | undefined;
|
|
266
267
|
excludeTools?: string[] | undefined;
|
|
267
268
|
trust?: boolean | undefined;
|
|
268
|
-
includeTools?: string[] | undefined;
|
|
269
269
|
}>>>;
|
|
270
270
|
}, "strip", z.ZodTypeAny, {
|
|
271
271
|
mcpServers?: Record<string, {
|
|
272
|
-
url?: string | undefined;
|
|
273
272
|
type?: "http" | "sse" | undefined;
|
|
273
|
+
url?: string | undefined;
|
|
274
|
+
includeTools?: string[] | undefined;
|
|
274
275
|
excludeTools?: string[] | undefined;
|
|
275
276
|
trust?: boolean | undefined;
|
|
276
|
-
includeTools?: string[] | undefined;
|
|
277
277
|
}> | undefined;
|
|
278
278
|
}, {
|
|
279
279
|
mcpServers?: Record<string, {
|
|
280
|
-
url?: string | undefined;
|
|
281
280
|
type?: "http" | "sse" | undefined;
|
|
281
|
+
url?: string | undefined;
|
|
282
|
+
includeTools?: string[] | undefined;
|
|
282
283
|
excludeTools?: string[] | undefined;
|
|
283
284
|
trust?: boolean | undefined;
|
|
284
|
-
includeTools?: string[] | undefined;
|
|
285
285
|
}> | undefined;
|
|
286
286
|
}>;
|
|
287
287
|
export type McpConfigDefinition = z.infer<typeof McpConfigDefinitionSchema>;
|
|
@@ -297,55 +297,55 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
|
|
|
297
297
|
includeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
298
298
|
excludeTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
299
299
|
}, "strip", z.ZodTypeAny, {
|
|
300
|
-
url?: string | undefined;
|
|
301
300
|
type?: "http" | "sse" | undefined;
|
|
301
|
+
url?: string | undefined;
|
|
302
|
+
includeTools?: string[] | undefined;
|
|
302
303
|
excludeTools?: string[] | undefined;
|
|
303
304
|
trust?: boolean | undefined;
|
|
304
|
-
includeTools?: string[] | undefined;
|
|
305
305
|
}, {
|
|
306
|
-
url?: string | undefined;
|
|
307
306
|
type?: "http" | "sse" | undefined;
|
|
307
|
+
url?: string | undefined;
|
|
308
|
+
includeTools?: string[] | undefined;
|
|
308
309
|
excludeTools?: string[] | undefined;
|
|
309
310
|
trust?: boolean | undefined;
|
|
310
|
-
includeTools?: string[] | undefined;
|
|
311
311
|
}>>>;
|
|
312
312
|
}, "strip", z.ZodTypeAny, {
|
|
313
313
|
mcpServers?: Record<string, {
|
|
314
|
-
url?: string | undefined;
|
|
315
314
|
type?: "http" | "sse" | undefined;
|
|
315
|
+
url?: string | undefined;
|
|
316
|
+
includeTools?: string[] | undefined;
|
|
316
317
|
excludeTools?: string[] | undefined;
|
|
317
318
|
trust?: boolean | undefined;
|
|
318
|
-
includeTools?: string[] | undefined;
|
|
319
319
|
}> | undefined;
|
|
320
320
|
}, {
|
|
321
321
|
mcpServers?: Record<string, {
|
|
322
|
-
url?: string | undefined;
|
|
323
322
|
type?: "http" | "sse" | undefined;
|
|
323
|
+
url?: string | undefined;
|
|
324
|
+
includeTools?: string[] | undefined;
|
|
324
325
|
excludeTools?: string[] | undefined;
|
|
325
326
|
trust?: boolean | undefined;
|
|
326
|
-
includeTools?: string[] | undefined;
|
|
327
327
|
}> | undefined;
|
|
328
328
|
}>>;
|
|
329
329
|
}, "strip", z.ZodTypeAny, {
|
|
330
330
|
mcpEnabled?: boolean | undefined;
|
|
331
331
|
mcpConfig?: {
|
|
332
332
|
mcpServers?: Record<string, {
|
|
333
|
-
url?: string | undefined;
|
|
334
333
|
type?: "http" | "sse" | undefined;
|
|
334
|
+
url?: string | undefined;
|
|
335
|
+
includeTools?: string[] | undefined;
|
|
335
336
|
excludeTools?: string[] | undefined;
|
|
336
337
|
trust?: boolean | undefined;
|
|
337
|
-
includeTools?: string[] | undefined;
|
|
338
338
|
}> | undefined;
|
|
339
339
|
} | undefined;
|
|
340
340
|
}, {
|
|
341
341
|
mcpEnabled?: boolean | undefined;
|
|
342
342
|
mcpConfig?: {
|
|
343
343
|
mcpServers?: Record<string, {
|
|
344
|
-
url?: string | undefined;
|
|
345
344
|
type?: "http" | "sse" | undefined;
|
|
345
|
+
url?: string | undefined;
|
|
346
|
+
includeTools?: string[] | undefined;
|
|
346
347
|
excludeTools?: string[] | undefined;
|
|
347
348
|
trust?: boolean | undefined;
|
|
348
|
-
includeTools?: string[] | undefined;
|
|
349
349
|
}> | undefined;
|
|
350
350
|
} | undefined;
|
|
351
351
|
}>>;
|
|
@@ -375,11 +375,11 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
|
|
|
375
375
|
mcpEnabled?: boolean | undefined;
|
|
376
376
|
mcpConfig?: {
|
|
377
377
|
mcpServers?: Record<string, {
|
|
378
|
-
url?: string | undefined;
|
|
379
378
|
type?: "http" | "sse" | undefined;
|
|
379
|
+
url?: string | undefined;
|
|
380
|
+
includeTools?: string[] | undefined;
|
|
380
381
|
excludeTools?: string[] | undefined;
|
|
381
382
|
trust?: boolean | undefined;
|
|
382
|
-
includeTools?: string[] | undefined;
|
|
383
383
|
}> | undefined;
|
|
384
384
|
} | undefined;
|
|
385
385
|
} | undefined;
|
|
@@ -395,11 +395,11 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
|
|
|
395
395
|
mcpEnabled?: boolean | undefined;
|
|
396
396
|
mcpConfig?: {
|
|
397
397
|
mcpServers?: Record<string, {
|
|
398
|
-
url?: string | undefined;
|
|
399
398
|
type?: "http" | "sse" | undefined;
|
|
399
|
+
url?: string | undefined;
|
|
400
|
+
includeTools?: string[] | undefined;
|
|
400
401
|
excludeTools?: string[] | undefined;
|
|
401
402
|
trust?: boolean | undefined;
|
|
402
|
-
includeTools?: string[] | undefined;
|
|
403
403
|
}> | undefined;
|
|
404
404
|
} | undefined;
|
|
405
405
|
} | undefined;
|
|
@@ -446,6 +446,7 @@ export declare const FetchAdminControlsResponseSchema: z.ZodObject<{
|
|
|
446
446
|
}>>;
|
|
447
447
|
adminControlsApplicable: z.ZodOptional<z.ZodBoolean>;
|
|
448
448
|
}, "strip", z.ZodTypeAny, {
|
|
449
|
+
secureModeEnabled?: boolean | undefined;
|
|
449
450
|
strictModeDisabled?: boolean | undefined;
|
|
450
451
|
mcpSetting?: {
|
|
451
452
|
mcpEnabled?: boolean | undefined;
|
|
@@ -457,9 +458,9 @@ export declare const FetchAdminControlsResponseSchema: z.ZodObject<{
|
|
|
457
458
|
} | undefined;
|
|
458
459
|
unmanagedCapabilitiesEnabled?: boolean | undefined;
|
|
459
460
|
} | undefined;
|
|
460
|
-
secureModeEnabled?: boolean | undefined;
|
|
461
461
|
adminControlsApplicable?: boolean | undefined;
|
|
462
462
|
}, {
|
|
463
|
+
secureModeEnabled?: boolean | undefined;
|
|
463
464
|
strictModeDisabled?: boolean | undefined;
|
|
464
465
|
mcpSetting?: {
|
|
465
466
|
mcpEnabled?: boolean | undefined;
|
|
@@ -471,7 +472,6 @@ export declare const FetchAdminControlsResponseSchema: z.ZodObject<{
|
|
|
471
472
|
} | undefined;
|
|
472
473
|
unmanagedCapabilitiesEnabled?: boolean | undefined;
|
|
473
474
|
} | undefined;
|
|
474
|
-
secureModeEnabled?: boolean | undefined;
|
|
475
475
|
adminControlsApplicable?: boolean | undefined;
|
|
476
476
|
}>;
|
|
477
477
|
export {};
|
|
@@ -25,6 +25,12 @@ export declare class BedrockContentGenerator implements ContentGenerator {
|
|
|
25
25
|
region?: string;
|
|
26
26
|
});
|
|
27
27
|
private detectCredentialSource;
|
|
28
|
+
/**
|
|
29
|
+
* Build inference config with mutually exclusive temperature/topP.
|
|
30
|
+
* Bedrock forbids sending both for Claude models.
|
|
31
|
+
* When both are present, prefer temperature (more commonly configured).
|
|
32
|
+
*/
|
|
33
|
+
private buildInferenceConfig;
|
|
28
34
|
generateContent(request: GenerateContentParameters, _userPromptId: string, _role?: LlmRole): Promise<GenerateContentResponse>;
|
|
29
35
|
generateContentStream(request: GenerateContentParameters, _userPromptId: string, _role?: LlmRole): Promise<AsyncGenerator<GenerateContentResponse>>;
|
|
30
36
|
countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
|
|
@@ -41,6 +41,26 @@ export class BedrockContentGenerator {
|
|
|
41
41
|
}
|
|
42
42
|
return 'AWS SDK default credential chain';
|
|
43
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Build inference config with mutually exclusive temperature/topP.
|
|
46
|
+
* Bedrock forbids sending both for Claude models.
|
|
47
|
+
* When both are present, prefer temperature (more commonly configured).
|
|
48
|
+
*/
|
|
49
|
+
buildInferenceConfig(request) {
|
|
50
|
+
const config = {
|
|
51
|
+
maxTokens: request.config?.maxOutputTokens || 4096,
|
|
52
|
+
};
|
|
53
|
+
if (request.config?.temperature !== undefined) {
|
|
54
|
+
config.temperature = request.config.temperature;
|
|
55
|
+
}
|
|
56
|
+
else if (request.config?.topP !== undefined) {
|
|
57
|
+
config.topP = request.config.topP;
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
config.temperature = 1.0;
|
|
61
|
+
}
|
|
62
|
+
return config;
|
|
63
|
+
}
|
|
44
64
|
async generateContent(request, _userPromptId, _role) {
|
|
45
65
|
const startTime = Date.now();
|
|
46
66
|
const { messages, system } = this.convertToBedrockMessages(request);
|
|
@@ -57,11 +77,7 @@ export class BedrockContentGenerator {
|
|
|
57
77
|
messages,
|
|
58
78
|
system,
|
|
59
79
|
toolConfig,
|
|
60
|
-
inferenceConfig:
|
|
61
|
-
maxTokens: request.config?.maxOutputTokens || 4096,
|
|
62
|
-
temperature: request.config?.temperature ?? 1.0,
|
|
63
|
-
topP: request.config?.topP,
|
|
64
|
-
},
|
|
80
|
+
inferenceConfig: this.buildInferenceConfig(request),
|
|
65
81
|
});
|
|
66
82
|
debugLogger.log(`[Bedrock] Sending request:\n` +
|
|
67
83
|
` Model: ${this.model}\n` +
|
|
@@ -103,11 +119,7 @@ export class BedrockContentGenerator {
|
|
|
103
119
|
messages,
|
|
104
120
|
system,
|
|
105
121
|
toolConfig,
|
|
106
|
-
inferenceConfig:
|
|
107
|
-
maxTokens: request.config?.maxOutputTokens || 4096,
|
|
108
|
-
temperature: request.config?.temperature ?? 1.0,
|
|
109
|
-
topP: request.config?.topP,
|
|
110
|
-
},
|
|
122
|
+
inferenceConfig: this.buildInferenceConfig(request),
|
|
111
123
|
});
|
|
112
124
|
debugLogger.log(`[Bedrock] Sending stream request:\n` +
|
|
113
125
|
` Model: ${this.model}\n` +
|
|
@@ -370,7 +382,7 @@ export class BedrockContentGenerator {
|
|
|
370
382
|
toolUse: {
|
|
371
383
|
toolUseId: fc.id || `tool_${Date.now()}_${Math.random()}`,
|
|
372
384
|
name: fc.name,
|
|
373
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
385
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
|
|
374
386
|
input: fc.args, // Bedrock accepts any JSON-serializable value
|
|
375
387
|
},
|
|
376
388
|
});
|
|
@@ -446,6 +458,7 @@ export class BedrockContentGenerator {
|
|
|
446
458
|
functionCall: {
|
|
447
459
|
id: toolUse.toolUseId,
|
|
448
460
|
name: toolUse.name || '',
|
|
461
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
|
449
462
|
args: toolUse.input || {},
|
|
450
463
|
},
|
|
451
464
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrockContentGenerator.js","sourceRoot":"","sources":["../../../src/core/bedrockContentGenerator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bedrockContentGenerator.js","sourceRoot":"","sources":["../../../src/core/bedrockContentGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,8 @@ export declare class OpenAIContentGenerator implements ContentGenerator {
|
|
|
16
16
|
protected readonly isOpenRouter: boolean;
|
|
17
17
|
private streamingToolCalls;
|
|
18
18
|
private streamingReasoningDetails;
|
|
19
|
+
private streamingReasoningContent;
|
|
20
|
+
private reasoningContentHistory;
|
|
19
21
|
constructor(apiKey: string, model: string, config: Config);
|
|
20
22
|
/**
|
|
21
23
|
* Hook for subclasses to customize error handling behavior
|
|
@@ -51,10 +53,6 @@ export declare class OpenAIContentGenerator implements ContentGenerator {
|
|
|
51
53
|
private convertGeminiParametersToOpenAI;
|
|
52
54
|
private convertGeminiToolsToOpenAI;
|
|
53
55
|
private convertToOpenAIFormat;
|
|
54
|
-
/**
|
|
55
|
-
* Check if the current model is a DeepSeek Reasoner model
|
|
56
|
-
*/
|
|
57
|
-
private isDeepSeekReasonerModel;
|
|
58
56
|
/**
|
|
59
57
|
* Check if the current model is a Gemini reasoning model (Gemini 3, 2.5 series)
|
|
60
58
|
* These models require reasoning_details/thought_signature for tool calls
|
|
@@ -71,10 +69,12 @@ export declare class OpenAIContentGenerator implements ContentGenerator {
|
|
|
71
69
|
*/
|
|
72
70
|
private isValidThoughtSignature;
|
|
73
71
|
/**
|
|
74
|
-
* Add reasoning_content field to assistant messages for
|
|
75
|
-
*
|
|
72
|
+
* Add reasoning_content field to assistant messages for thinking-enabled models.
|
|
73
|
+
* Models like Kimi K2.5 require the actual reasoning content to be echoed back;
|
|
74
|
+
* models like DeepSeek accept an empty string.
|
|
75
|
+
* We use the stored history when available, falling back to empty string.
|
|
76
76
|
*/
|
|
77
|
-
private
|
|
77
|
+
private addReasoningContentToAssistantMessages;
|
|
78
78
|
/**
|
|
79
79
|
* Filter out REASONING_DETAILS_MARKER from text to prevent it from leaking
|
|
80
80
|
* into messages sent to the model. This can happen when AionUI includes
|
|
@@ -19,6 +19,11 @@ export class OpenAIContentGenerator {
|
|
|
19
19
|
streamingToolCalls = new Map();
|
|
20
20
|
// Store reasoning_details for OpenRouter reasoning models (Gemini 3 Pro, etc.)
|
|
21
21
|
streamingReasoningDetails = null;
|
|
22
|
+
// Accumulate reasoning_content from the current streaming response (e.g. Kimi K2.5, DeepSeek).
|
|
23
|
+
streamingReasoningContent = '';
|
|
24
|
+
// Stores the full reasoning_content for each model response, in order.
|
|
25
|
+
// Used to echo the actual content back when reconstructing assistant messages.
|
|
26
|
+
reasoningContentHistory = [];
|
|
22
27
|
constructor(apiKey, model, config) {
|
|
23
28
|
this.model = model;
|
|
24
29
|
this.config = config;
|
|
@@ -435,9 +440,12 @@ export class OpenAIContentGenerator {
|
|
|
435
440
|
// Reset the accumulators for each new stream
|
|
436
441
|
this.streamingToolCalls.clear();
|
|
437
442
|
this.streamingReasoningDetails = null;
|
|
443
|
+
this.streamingReasoningContent = '';
|
|
438
444
|
for await (const chunk of stream) {
|
|
439
445
|
yield this.convertStreamChunkToGeminiFormat(chunk, isJsonSchemaRequest);
|
|
440
446
|
}
|
|
447
|
+
// Persist the accumulated reasoning_content for this model turn
|
|
448
|
+
this.reasoningContentHistory.push(this.streamingReasoningContent);
|
|
441
449
|
}
|
|
442
450
|
/**
|
|
443
451
|
* Combine streaming responses for logging purposes
|
|
@@ -689,7 +697,8 @@ export class OpenAIContentGenerator {
|
|
|
689
697
|
function: {
|
|
690
698
|
name: func.name,
|
|
691
699
|
description: func.description,
|
|
692
|
-
parameters
|
|
700
|
+
// Support both Gemini-native `parameters` and core `parametersJsonSchema` (from zodToJsonSchema)
|
|
701
|
+
parameters: this.convertGeminiParametersToOpenAI((func.parameters || func.parametersJsonSchema || {})),
|
|
693
702
|
},
|
|
694
703
|
});
|
|
695
704
|
}
|
|
@@ -875,19 +884,10 @@ export class OpenAIContentGenerator {
|
|
|
875
884
|
// Clean up orphaned tool calls and merge consecutive assistant messages
|
|
876
885
|
const cleanedMessages = this.cleanOrphanedToolCalls(messages);
|
|
877
886
|
const mergedMessages = this.mergeConsecutiveAssistantMessages(cleanedMessages);
|
|
878
|
-
// Add reasoning_content
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
return mergedMessages;
|
|
883
|
-
}
|
|
884
|
-
/**
|
|
885
|
-
* Check if the current model is a DeepSeek Reasoner model
|
|
886
|
-
*/
|
|
887
|
-
isDeepSeekReasonerModel() {
|
|
888
|
-
const modelName = this.model.toLowerCase();
|
|
889
|
-
return (modelName.includes('deepseek-reasoner') ||
|
|
890
|
-
modelName.includes('deepseek-r1'));
|
|
887
|
+
// Add reasoning_content to all assistant messages unconditionally.
|
|
888
|
+
// Thinking-enabled models (DeepSeek Reasoner, Kimi K2.5, etc.) require this field;
|
|
889
|
+
// other OpenAI-compatible APIs simply ignore unknown fields.
|
|
890
|
+
return this.addReasoningContentToAssistantMessages(mergedMessages);
|
|
891
891
|
}
|
|
892
892
|
/**
|
|
893
893
|
* Check if the current model is a Gemini reasoning model (Gemini 3, 2.5 series)
|
|
@@ -951,17 +951,20 @@ export class OpenAIContentGenerator {
|
|
|
951
951
|
return true;
|
|
952
952
|
}
|
|
953
953
|
/**
|
|
954
|
-
* Add reasoning_content field to assistant messages for
|
|
955
|
-
*
|
|
954
|
+
* Add reasoning_content field to assistant messages for thinking-enabled models.
|
|
955
|
+
* Models like Kimi K2.5 require the actual reasoning content to be echoed back;
|
|
956
|
+
* models like DeepSeek accept an empty string.
|
|
957
|
+
* We use the stored history when available, falling back to empty string.
|
|
956
958
|
*/
|
|
957
|
-
|
|
959
|
+
addReasoningContentToAssistantMessages(messages) {
|
|
960
|
+
let assistantIndex = 0;
|
|
958
961
|
return messages.map((message) => {
|
|
959
962
|
if (message.role === 'assistant') {
|
|
960
|
-
|
|
961
|
-
|
|
963
|
+
const reasoningContent = this.reasoningContentHistory[assistantIndex] ?? '';
|
|
964
|
+
assistantIndex++;
|
|
962
965
|
return {
|
|
963
966
|
...message,
|
|
964
|
-
reasoning_content:
|
|
967
|
+
reasoning_content: reasoningContent,
|
|
965
968
|
};
|
|
966
969
|
}
|
|
967
970
|
return message;
|
|
@@ -1152,6 +1155,12 @@ export class OpenAIContentGenerator {
|
|
|
1152
1155
|
if (choice.message.content) {
|
|
1153
1156
|
parts.push({ text: choice.message.content });
|
|
1154
1157
|
}
|
|
1158
|
+
// Capture reasoning_content from non-streaming responses
|
|
1159
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1160
|
+
const messageReasoningContent = choice.message?.reasoning_content;
|
|
1161
|
+
this.reasoningContentHistory.push(typeof messageReasoningContent === 'string'
|
|
1162
|
+
? messageReasoningContent
|
|
1163
|
+
: '');
|
|
1155
1164
|
// Handle tool calls
|
|
1156
1165
|
if (choice.message.tool_calls) {
|
|
1157
1166
|
for (const toolCall of choice.message.tool_calls) {
|
|
@@ -1275,6 +1284,11 @@ export class OpenAIContentGenerator {
|
|
|
1275
1284
|
this.isValidThoughtSignature(deltaReasoningDetails)) {
|
|
1276
1285
|
this.streamingReasoningDetails = deltaReasoningDetails;
|
|
1277
1286
|
}
|
|
1287
|
+
// Accumulate reasoning_content from thinking-enabled models (Kimi K2.5, DeepSeek, etc.)
|
|
1288
|
+
const deltaReasoningContent = choiceAny.delta?.reasoning_content;
|
|
1289
|
+
if (typeof deltaReasoningContent === 'string') {
|
|
1290
|
+
this.streamingReasoningContent += deltaReasoningContent;
|
|
1291
|
+
}
|
|
1278
1292
|
// Handle tool calls - only accumulate during streaming, emit when complete
|
|
1279
1293
|
if (choice.delta?.tool_calls) {
|
|
1280
1294
|
for (const toolCall of choice.delta.tool_calls) {
|