@didim365/agent-cli-core 0.2.2 → 0.2.4
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/src/agents/cli-help-agent.d.ts +2 -2
- package/dist/src/agents/llmAgentChatSession.d.ts +117 -0
- package/dist/src/agents/llmAgentChatSession.js +252 -0
- package/dist/src/agents/llmAgentChatSession.js.map +1 -0
- package/dist/src/agents/local-invocation.d.ts +7 -0
- package/dist/src/agents/local-invocation.js +71 -1
- package/dist/src/agents/local-invocation.js.map +1 -1
- package/dist/src/core/baseLlmClient.d.ts +16 -0
- package/dist/src/core/baseLlmClient.js +134 -2
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/client.d.ts +6 -0
- package/dist/src/core/client.js +75 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/llmMessageUtils.d.ts +36 -0
- package/dist/src/core/llmMessageUtils.js +66 -0
- package/dist/src/core/llmMessageUtils.js.map +1 -0
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/ide/types.d.ts +32 -32
- package/dist/src/providers/gemini/requestBuilder.js +7 -1
- package/dist/src/providers/gemini/requestBuilder.js.map +1 -1
- package/dist/src/providers/gemini/typeConversion.d.ts +11 -2
- package/dist/src/providers/gemini/typeConversion.js +42 -0
- package/dist/src/providers/gemini/typeConversion.js.map +1 -1
- package/dist/src/providers/openai/adapter.js +7 -1
- package/dist/src/providers/openai/adapter.js.map +1 -1
- package/dist/src/services/loopDetectionService.js +9 -8
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/sessionSummaryUtils.js +1 -8
- package/dist/src/services/sessionSummaryUtils.js.map +1 -1
- package/dist/src/utils/environmentContext.js +5 -0
- package/dist/src/utils/environmentContext.js.map +1 -1
- package/dist/src/utils/tokenCalculation.js +37 -0
- package/dist/src/utils/tokenCalculation.js.map +1 -1
- package/package.json +1 -1
- package/dist/src/utils/messageInspectors.d.ts +0 -16
- package/dist/src/utils/messageInspectors.js +0 -24
- package/dist/src/utils/messageInspectors.js.map +0 -1
package/dist/src/ide/types.d.ts
CHANGED
|
@@ -46,21 +46,21 @@ export declare const FileSchema: z.ZodObject<{
|
|
|
46
46
|
}, "strip", z.ZodTypeAny, {
|
|
47
47
|
path: string;
|
|
48
48
|
timestamp: number;
|
|
49
|
-
isActive?: boolean | undefined;
|
|
50
|
-
selectedText?: string | undefined;
|
|
51
49
|
cursor?: {
|
|
52
50
|
line: number;
|
|
53
51
|
character: number;
|
|
54
52
|
} | undefined;
|
|
53
|
+
isActive?: boolean | undefined;
|
|
54
|
+
selectedText?: string | undefined;
|
|
55
55
|
}, {
|
|
56
56
|
path: string;
|
|
57
57
|
timestamp: number;
|
|
58
|
-
isActive?: boolean | undefined;
|
|
59
|
-
selectedText?: string | undefined;
|
|
60
58
|
cursor?: {
|
|
61
59
|
line: number;
|
|
62
60
|
character: number;
|
|
63
61
|
} | undefined;
|
|
62
|
+
isActive?: boolean | undefined;
|
|
63
|
+
selectedText?: string | undefined;
|
|
64
64
|
}>;
|
|
65
65
|
export type File = z.infer<typeof FileSchema>;
|
|
66
66
|
/**
|
|
@@ -110,21 +110,21 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
110
110
|
}, "strip", z.ZodTypeAny, {
|
|
111
111
|
path: string;
|
|
112
112
|
timestamp: number;
|
|
113
|
-
isActive?: boolean | undefined;
|
|
114
|
-
selectedText?: string | undefined;
|
|
115
113
|
cursor?: {
|
|
116
114
|
line: number;
|
|
117
115
|
character: number;
|
|
118
116
|
} | undefined;
|
|
117
|
+
isActive?: boolean | undefined;
|
|
118
|
+
selectedText?: string | undefined;
|
|
119
119
|
}, {
|
|
120
120
|
path: string;
|
|
121
121
|
timestamp: number;
|
|
122
|
-
isActive?: boolean | undefined;
|
|
123
|
-
selectedText?: string | undefined;
|
|
124
122
|
cursor?: {
|
|
125
123
|
line: number;
|
|
126
124
|
character: number;
|
|
127
125
|
} | undefined;
|
|
126
|
+
isActive?: boolean | undefined;
|
|
127
|
+
selectedText?: string | undefined;
|
|
128
128
|
}>, "many">>;
|
|
129
129
|
/**
|
|
130
130
|
* Whether the workspace is trusted.
|
|
@@ -134,24 +134,24 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
134
134
|
openFiles?: {
|
|
135
135
|
path: string;
|
|
136
136
|
timestamp: number;
|
|
137
|
-
isActive?: boolean | undefined;
|
|
138
|
-
selectedText?: string | undefined;
|
|
139
137
|
cursor?: {
|
|
140
138
|
line: number;
|
|
141
139
|
character: number;
|
|
142
140
|
} | undefined;
|
|
141
|
+
isActive?: boolean | undefined;
|
|
142
|
+
selectedText?: string | undefined;
|
|
143
143
|
}[] | undefined;
|
|
144
144
|
isTrusted?: boolean | undefined;
|
|
145
145
|
}, {
|
|
146
146
|
openFiles?: {
|
|
147
147
|
path: string;
|
|
148
148
|
timestamp: number;
|
|
149
|
-
isActive?: boolean | undefined;
|
|
150
|
-
selectedText?: string | undefined;
|
|
151
149
|
cursor?: {
|
|
152
150
|
line: number;
|
|
153
151
|
character: number;
|
|
154
152
|
} | undefined;
|
|
153
|
+
isActive?: boolean | undefined;
|
|
154
|
+
selectedText?: string | undefined;
|
|
155
155
|
}[] | undefined;
|
|
156
156
|
isTrusted?: boolean | undefined;
|
|
157
157
|
}>>;
|
|
@@ -160,12 +160,12 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
160
160
|
openFiles?: {
|
|
161
161
|
path: string;
|
|
162
162
|
timestamp: number;
|
|
163
|
-
isActive?: boolean | undefined;
|
|
164
|
-
selectedText?: string | undefined;
|
|
165
163
|
cursor?: {
|
|
166
164
|
line: number;
|
|
167
165
|
character: number;
|
|
168
166
|
} | undefined;
|
|
167
|
+
isActive?: boolean | undefined;
|
|
168
|
+
selectedText?: string | undefined;
|
|
169
169
|
}[] | undefined;
|
|
170
170
|
isTrusted?: boolean | undefined;
|
|
171
171
|
} | undefined;
|
|
@@ -174,12 +174,12 @@ export declare const IdeContextSchema: z.ZodObject<{
|
|
|
174
174
|
openFiles?: {
|
|
175
175
|
path: string;
|
|
176
176
|
timestamp: number;
|
|
177
|
-
isActive?: boolean | undefined;
|
|
178
|
-
selectedText?: string | undefined;
|
|
179
177
|
cursor?: {
|
|
180
178
|
line: number;
|
|
181
179
|
character: number;
|
|
182
180
|
} | undefined;
|
|
181
|
+
isActive?: boolean | undefined;
|
|
182
|
+
selectedText?: string | undefined;
|
|
183
183
|
}[] | undefined;
|
|
184
184
|
isTrusted?: boolean | undefined;
|
|
185
185
|
} | undefined;
|
|
@@ -235,21 +235,21 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
235
235
|
}, "strip", z.ZodTypeAny, {
|
|
236
236
|
path: string;
|
|
237
237
|
timestamp: number;
|
|
238
|
-
isActive?: boolean | undefined;
|
|
239
|
-
selectedText?: string | undefined;
|
|
240
238
|
cursor?: {
|
|
241
239
|
line: number;
|
|
242
240
|
character: number;
|
|
243
241
|
} | undefined;
|
|
242
|
+
isActive?: boolean | undefined;
|
|
243
|
+
selectedText?: string | undefined;
|
|
244
244
|
}, {
|
|
245
245
|
path: string;
|
|
246
246
|
timestamp: number;
|
|
247
|
-
isActive?: boolean | undefined;
|
|
248
|
-
selectedText?: string | undefined;
|
|
249
247
|
cursor?: {
|
|
250
248
|
line: number;
|
|
251
249
|
character: number;
|
|
252
250
|
} | undefined;
|
|
251
|
+
isActive?: boolean | undefined;
|
|
252
|
+
selectedText?: string | undefined;
|
|
253
253
|
}>, "many">>;
|
|
254
254
|
/**
|
|
255
255
|
* Whether the workspace is trusted.
|
|
@@ -259,24 +259,24 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
259
259
|
openFiles?: {
|
|
260
260
|
path: string;
|
|
261
261
|
timestamp: number;
|
|
262
|
-
isActive?: boolean | undefined;
|
|
263
|
-
selectedText?: string | undefined;
|
|
264
262
|
cursor?: {
|
|
265
263
|
line: number;
|
|
266
264
|
character: number;
|
|
267
265
|
} | undefined;
|
|
266
|
+
isActive?: boolean | undefined;
|
|
267
|
+
selectedText?: string | undefined;
|
|
268
268
|
}[] | undefined;
|
|
269
269
|
isTrusted?: boolean | undefined;
|
|
270
270
|
}, {
|
|
271
271
|
openFiles?: {
|
|
272
272
|
path: string;
|
|
273
273
|
timestamp: number;
|
|
274
|
-
isActive?: boolean | undefined;
|
|
275
|
-
selectedText?: string | undefined;
|
|
276
274
|
cursor?: {
|
|
277
275
|
line: number;
|
|
278
276
|
character: number;
|
|
279
277
|
} | undefined;
|
|
278
|
+
isActive?: boolean | undefined;
|
|
279
|
+
selectedText?: string | undefined;
|
|
280
280
|
}[] | undefined;
|
|
281
281
|
isTrusted?: boolean | undefined;
|
|
282
282
|
}>>;
|
|
@@ -285,12 +285,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
285
285
|
openFiles?: {
|
|
286
286
|
path: string;
|
|
287
287
|
timestamp: number;
|
|
288
|
-
isActive?: boolean | undefined;
|
|
289
|
-
selectedText?: string | undefined;
|
|
290
288
|
cursor?: {
|
|
291
289
|
line: number;
|
|
292
290
|
character: number;
|
|
293
291
|
} | undefined;
|
|
292
|
+
isActive?: boolean | undefined;
|
|
293
|
+
selectedText?: string | undefined;
|
|
294
294
|
}[] | undefined;
|
|
295
295
|
isTrusted?: boolean | undefined;
|
|
296
296
|
} | undefined;
|
|
@@ -299,12 +299,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
299
299
|
openFiles?: {
|
|
300
300
|
path: string;
|
|
301
301
|
timestamp: number;
|
|
302
|
-
isActive?: boolean | undefined;
|
|
303
|
-
selectedText?: string | undefined;
|
|
304
302
|
cursor?: {
|
|
305
303
|
line: number;
|
|
306
304
|
character: number;
|
|
307
305
|
} | undefined;
|
|
306
|
+
isActive?: boolean | undefined;
|
|
307
|
+
selectedText?: string | undefined;
|
|
308
308
|
}[] | undefined;
|
|
309
309
|
isTrusted?: boolean | undefined;
|
|
310
310
|
} | undefined;
|
|
@@ -315,12 +315,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
315
315
|
openFiles?: {
|
|
316
316
|
path: string;
|
|
317
317
|
timestamp: number;
|
|
318
|
-
isActive?: boolean | undefined;
|
|
319
|
-
selectedText?: string | undefined;
|
|
320
318
|
cursor?: {
|
|
321
319
|
line: number;
|
|
322
320
|
character: number;
|
|
323
321
|
} | undefined;
|
|
322
|
+
isActive?: boolean | undefined;
|
|
323
|
+
selectedText?: string | undefined;
|
|
324
324
|
}[] | undefined;
|
|
325
325
|
isTrusted?: boolean | undefined;
|
|
326
326
|
} | undefined;
|
|
@@ -333,12 +333,12 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
|
|
|
333
333
|
openFiles?: {
|
|
334
334
|
path: string;
|
|
335
335
|
timestamp: number;
|
|
336
|
-
isActive?: boolean | undefined;
|
|
337
|
-
selectedText?: string | undefined;
|
|
338
336
|
cursor?: {
|
|
339
337
|
line: number;
|
|
340
338
|
character: number;
|
|
341
339
|
} | undefined;
|
|
340
|
+
isActive?: boolean | undefined;
|
|
341
|
+
selectedText?: string | undefined;
|
|
342
342
|
}[] | undefined;
|
|
343
343
|
isTrusted?: boolean | undefined;
|
|
344
344
|
} | undefined;
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { fixToolResultRoles } from '../../core/llmMessageUtils.js';
|
|
6
7
|
import { convertContentsToLlmMessages, convertPartListUnionToLlmContents, } from './typeConversion.js';
|
|
7
8
|
// ============================================================================
|
|
8
9
|
// Tool conversion: Gemini Tool[] → LlmToolDefinition[]
|
|
@@ -100,10 +101,15 @@ export function buildLlmRequestFromGeminiState(opts) {
|
|
|
100
101
|
// Convert current request PartListUnion → LlmContent[]
|
|
101
102
|
const currentContents = convertPartListUnionToLlmContents(opts.currentRequest);
|
|
102
103
|
// Append current request as a user message
|
|
103
|
-
const
|
|
104
|
+
const rawMessages = [
|
|
104
105
|
...historyMessages,
|
|
105
106
|
{ role: 'user', content: currentContents },
|
|
106
107
|
];
|
|
108
|
+
// Fix tool_result roles: Gemini stores functionResponse as role:'user',
|
|
109
|
+
// but OpenAI requires role:'tool' with tool_call_id.
|
|
110
|
+
// fixToolResultRoles() converts { role:'user', content:[tool_result] }
|
|
111
|
+
// → { role:'tool', content:[tool_result] } for provider compatibility.
|
|
112
|
+
const messages = fixToolResultRoles(rawMessages);
|
|
107
113
|
// Build the request with required fields
|
|
108
114
|
const request = {
|
|
109
115
|
model: opts.model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestBuilder.js","sourceRoot":"","sources":["../../../../src/providers/gemini/requestBuilder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA4BH,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,GAClC,MAAM,qBAAqB,CAAC;AAE7B,+EAA+E;AAC/E,uDAAuD;AACvD,+EAA+E;AAE/E,gEAAgE;AAChE,MAAM,eAAe,GAAwC;IAC3D,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF;;;GAGG;AACH,SAAS,qBAAqB,CAC5B,MAA+B;IAE/B,MAAM,OAAO,GAAI,MAAM,CAAC,MAAM,CAAwB,IAAI,QAAQ,CAAC;IACnE,MAAM,IAAI,GAAoB;QAC5B,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,IAAI,QAAQ;KAC3C,CAAC;IAEF,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,aAAa,CAAW,CAAC;IACrD,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAa,CAAC;IACzC,CAAC;IAED,2BAA2B;IAC3B,IAAI,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QACzB,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAGtC,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,cAAc;IACd,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,qBAAqB,CAChC,MAAM,CAAC,OAAO,CAA4B,CAC3C,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAa;IACnD,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC/C,IAAI,CAAC,YAAY;YAAE,SAAS;QAE5B,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAiD,CAAC;YACtE,MAAM,UAAU,GAAoC,EAAE,CAAC;YAEvD,IAAI,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAGnC,CAAC;gBACF,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAClD,UAAU,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC;YAED,MAAM,UAAU,GAAsB;gBACpC,IAAI,EAAE,QAAQ;gBACd,UAAU;aACX,CAAC;YAEF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;gBACzB,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAa,CAAC;YACvD,CAAC;YAED,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,IAAI,CAAC,IAAK;gBAChB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;gBACnC,UAAU;aACX,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAwBD;;;;;;;;;GASG;AACH,MAAM,UAAU,8BAA8B,CAC5C,IAA4B;IAE5B,2CAA2C;IAC3C,MAAM,eAAe,GAAG,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEnE,uDAAuD;IACvD,MAAM,eAAe,GAAG,iCAAiC,CACvD,IAAI,CAAC,cAAc,CACpB,CAAC;IAEF,2CAA2C;IAC3C,MAAM,
|
|
1
|
+
{"version":3,"file":"requestBuilder.js","sourceRoot":"","sources":["../../../../src/providers/gemini/requestBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
* Used by routing call sites (client.ts, local-executor.ts) to bridge
|
|
13
13
|
* Gemini-specific chat history to provider-independent RoutingContext.
|
|
14
14
|
*/
|
|
15
|
-
import type { Content, PartListUnion } from '@google/genai';
|
|
16
|
-
import type { LlmContent, LlmMessage } from '../types.js';
|
|
15
|
+
import type { Content, GenerateContentResponse, PartListUnion } from '@google/genai';
|
|
16
|
+
import type { LlmContent, LlmGenerateResponse, LlmMessage } from '../types.js';
|
|
17
17
|
/**
|
|
18
18
|
* Convert a single Gemini Content to an LlmMessage.
|
|
19
19
|
*/
|
|
@@ -49,3 +49,12 @@ export declare function isContentToolCallMessage(content: Content): boolean;
|
|
|
49
49
|
* messageInspectors.ts. See {@link isContentToolCallMessage} for safety details.
|
|
50
50
|
*/
|
|
51
51
|
export declare function isContentToolResultMessage(content: Content): boolean;
|
|
52
|
+
/**
|
|
53
|
+
* Convert LlmGenerateResponse → GenerateContentResponse.
|
|
54
|
+
*
|
|
55
|
+
* Builds the minimal Gemini SDK response structure needed by callers
|
|
56
|
+
* that expect `candidates[0].content.parts[0].text` (e.g. getResponseText()).
|
|
57
|
+
*
|
|
58
|
+
* Handles text, tool_call, and thought content types.
|
|
59
|
+
*/
|
|
60
|
+
export declare function convertLlmResponseToGeminiResponse(llmResponse: LlmGenerateResponse): GenerateContentResponse;
|
|
@@ -162,4 +162,46 @@ export function isContentToolResultMessage(content) {
|
|
|
162
162
|
return false;
|
|
163
163
|
return llmMessage.content.every((c) => isToolResultContent(c));
|
|
164
164
|
}
|
|
165
|
+
/**
|
|
166
|
+
* Convert LlmGenerateResponse → GenerateContentResponse.
|
|
167
|
+
*
|
|
168
|
+
* Builds the minimal Gemini SDK response structure needed by callers
|
|
169
|
+
* that expect `candidates[0].content.parts[0].text` (e.g. getResponseText()).
|
|
170
|
+
*
|
|
171
|
+
* Handles text, tool_call, and thought content types.
|
|
172
|
+
*/
|
|
173
|
+
export function convertLlmResponseToGeminiResponse(llmResponse) {
|
|
174
|
+
const parts = [];
|
|
175
|
+
for (const c of llmResponse.content) {
|
|
176
|
+
switch (c.type) {
|
|
177
|
+
case 'text':
|
|
178
|
+
parts.push({ text: c.text });
|
|
179
|
+
break;
|
|
180
|
+
case 'tool_call':
|
|
181
|
+
parts.push({
|
|
182
|
+
functionCall: {
|
|
183
|
+
id: c.id,
|
|
184
|
+
name: c.name,
|
|
185
|
+
args: c.arguments,
|
|
186
|
+
},
|
|
187
|
+
});
|
|
188
|
+
break;
|
|
189
|
+
case 'thought':
|
|
190
|
+
parts.push({ text: c.thought, thought: true });
|
|
191
|
+
break;
|
|
192
|
+
default:
|
|
193
|
+
break;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
return {
|
|
197
|
+
candidates: [
|
|
198
|
+
{
|
|
199
|
+
content: {
|
|
200
|
+
role: 'model',
|
|
201
|
+
parts,
|
|
202
|
+
},
|
|
203
|
+
},
|
|
204
|
+
],
|
|
205
|
+
};
|
|
206
|
+
}
|
|
165
207
|
//# sourceMappingURL=typeConversion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeConversion.js","sourceRoot":"","sources":["../../../../src/providers/gemini/typeConversion.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"typeConversion.js","sourceRoot":"","sources":["../../../../src/providers/gemini/typeConversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,9 @@
|
|
|
14
14
|
*/
|
|
15
15
|
import { BaseAdapter } from '../baseAdapter.js';
|
|
16
16
|
import { LlmError, LlmErrorType, AuthenticationError, RateLimitError, ModelNotFoundError, NetworkError, TimeoutError, } from '../errors.js';
|
|
17
|
-
import { createErrorEvent } from '../events.js';
|
|
17
|
+
import { createErrorEvent, LlmEventType } from '../events.js';
|
|
18
18
|
import { OpenAiConverter } from './converter.js';
|
|
19
|
+
import { debugLogger } from '../../utils/debugLogger.js';
|
|
19
20
|
/**
|
|
20
21
|
* OpenAI adapter capabilities.
|
|
21
22
|
*
|
|
@@ -90,11 +91,16 @@ export class OpenAiAdapter extends BaseAdapter {
|
|
|
90
91
|
stream_options: { include_usage: true },
|
|
91
92
|
}, { signal }));
|
|
92
93
|
const state = converter.createStreamState();
|
|
94
|
+
let chunkIndex = 0;
|
|
93
95
|
for await (const chunk of stream) {
|
|
94
96
|
const events = converter.convertStreamEvent(chunk, state);
|
|
95
97
|
for (const event of events) {
|
|
98
|
+
if (event.type === LlmEventType.TextDelta) {
|
|
99
|
+
debugLogger.log(`[OpenAI stream] chunk#${chunkIndex} TextDelta: "${event.text.substring(0, 80)}"`);
|
|
100
|
+
}
|
|
96
101
|
yield event;
|
|
97
102
|
}
|
|
103
|
+
chunkIndex++;
|
|
98
104
|
}
|
|
99
105
|
}
|
|
100
106
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/providers/openai/adapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAUhD,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,YAAY,EACZ,YAAY,GACb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../src/providers/openai/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -189,16 +189,17 @@ export class LoopDetectionService {
|
|
|
189
189
|
const hasHeading = /(^|\n)#+\s/.test(content);
|
|
190
190
|
const hasBlockquote = /(^|\n)>\s/.test(content);
|
|
191
191
|
const isDivider = /^[+-_=*\u2500-\u257F]+$/.test(content);
|
|
192
|
-
if (numFences ||
|
|
193
|
-
|
|
194
|
-
hasListItem ||
|
|
195
|
-
hasHeading ||
|
|
196
|
-
hasBlockquote ||
|
|
197
|
-
isDivider) {
|
|
198
|
-
// Reset tracking when different content elements are detected to avoid analyzing content
|
|
199
|
-
// that spans across different element boundaries.
|
|
192
|
+
if (numFences || hasTable || hasHeading || hasBlockquote || isDivider) {
|
|
193
|
+
// Full reset on structural element boundaries to avoid cross-boundary false positives.
|
|
200
194
|
this.resetContentTracking();
|
|
201
195
|
}
|
|
196
|
+
else if (hasListItem) {
|
|
197
|
+
// For list items: reset stats but PRESERVE history.
|
|
198
|
+
// This prevents the loop detector from being blinded by repetitive numbered lists
|
|
199
|
+
// (e.g., "1. same text\n1. same text\n...") while still avoiding stale stats
|
|
200
|
+
// from content preceding the list.
|
|
201
|
+
this.resetContentTracking(/*resetHistory=*/ false);
|
|
202
|
+
}
|
|
202
203
|
const wasInCodeBlock = this.inCodeBlock;
|
|
203
204
|
this.inCodeBlock =
|
|
204
205
|
numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loopDetectionService.js","sourceRoot":"","sources":["../../../src/services/loopDetectionService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"loopDetectionService.js","sourceRoot":"","sources":["../../../src/services/loopDetectionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,14 +33,7 @@ async function generateAndSaveSummary(config, sessionPath) {
|
|
|
33
33
|
debugLogger.debug('[SessionSummary] Content generator not available, skipping summary generation');
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
-
//
|
|
37
|
-
// BaseLlmClient uses legacy Gemini generateContent() which non-Gemini
|
|
38
|
-
// providers do not support, causing reportError → console.error.
|
|
39
|
-
if (contentGenerator.providerName &&
|
|
40
|
-
contentGenerator.providerName !== 'gemini') {
|
|
41
|
-
debugLogger.debug(`[SessionSummary] Non-Gemini provider (${contentGenerator.providerName}), skipping summary generation`);
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
36
|
+
// [리뷰 #3] Non-Gemini providers now supported via BaseLlmClient llm* path (Phase 2).
|
|
44
37
|
const baseLlmClient = new BaseLlmClient(contentGenerator, config);
|
|
45
38
|
const summaryService = new SessionSummaryService(baseLlmClient);
|
|
46
39
|
// Generate summary
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionSummaryUtils.js","sourceRoot":"","sources":["../../../src/services/sessionSummaryUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EACL,mBAAmB,GAEpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC;;GAEG;AACH,KAAK,UAAU,sBAAsB,CACnC,MAAc,EACd,WAAmB;IAEnB,oBAAoB;IACpB,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,YAAY,GAAuB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE7D,iCAAiC;IACjC,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;QACzB,WAAW,CAAC,KAAK,CACf,+CAA+C,WAAW,YAAY,CACvE,CAAC;QACF,OAAO;IACT,CAAC;IAED,sBAAsB;IACtB,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,WAAW,CAAC,KAAK,CACf,gDAAgD,WAAW,EAAE,CAC9D,CAAC;QACF,OAAO;IACT,CAAC;IAED,yBAAyB;IACzB,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;IACtD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,WAAW,CAAC,KAAK,CACf,+EAA+E,CAChF,CAAC;QACF,OAAO;IACT,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"sessionSummaryUtils.js","sourceRoot":"","sources":["../../../src/services/sessionSummaryUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { getFolderStructure } from './getFolderStructure.js';
|
|
7
|
+
import { DIDIM_DIR } from './paths.js';
|
|
7
8
|
export const INITIAL_HISTORY_LENGTH = 1;
|
|
8
9
|
/**
|
|
9
10
|
* Generates a string describing the current workspace directories and their structures.
|
|
@@ -48,8 +49,12 @@ export async function getEnvironmentContext(config) {
|
|
|
48
49
|
const directoryContext = await getDirectoryContextString(config);
|
|
49
50
|
const tempDir = config.storage.getProjectTempDir();
|
|
50
51
|
const environmentMemory = config.getEnvironmentMemory();
|
|
52
|
+
const activeModel = config.getActiveModel();
|
|
53
|
+
const provider = process.env['LLM_PROVIDER'] || 'gemini';
|
|
51
54
|
const context = `
|
|
52
55
|
This is the Didim Agent CLI. We are setting up the context for our chat.
|
|
56
|
+
The current model is: ${activeModel} (provider: ${provider})
|
|
57
|
+
The configuration directory is: ${DIDIM_DIR}/ (e.g. .didim/settings.json, .didim/system.md)
|
|
53
58
|
Today's date is ${today} (formatted according to the user's locale).
|
|
54
59
|
My operating system is: ${platform}
|
|
55
60
|
The project's temporary directory is: ${tempDir}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentContext.js","sourceRoot":"","sources":["../../../src/utils/environmentContext.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"environmentContext.js","sourceRoot":"","sources":["../../../src/utils/environmentContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { convertPartListUnionToLlmContents } from '../providers/gemini/typeConversion.js';
|
|
6
7
|
import { debugLogger } from './debugLogger.js';
|
|
7
8
|
import { isTextContent, isImageContent } from './llmUtils.js';
|
|
8
9
|
// Token estimation constants
|
|
@@ -19,6 +20,9 @@ const PDF_TOKEN_ESTIMATE = 25800;
|
|
|
19
20
|
// Maximum number of characters to process with the full character-by-character heuristic.
|
|
20
21
|
// Above this, we use a faster approximation to avoid performance bottlenecks.
|
|
21
22
|
const MAX_CHARS_FOR_FULL_HEURISTIC = 100_000;
|
|
23
|
+
// Track providers that have already emitted llmCountTokens failure warning
|
|
24
|
+
// to avoid spamming logs on every media request (e.g. OpenAI supportsTokenCount=false).
|
|
25
|
+
const warnedProviders = new Set();
|
|
22
26
|
/**
|
|
23
27
|
* Estimates token count for parts synchronously using a heuristic.
|
|
24
28
|
* - Text: character-based heuristic (ASCII vs CJK) for small strings, length/4 for massive ones.
|
|
@@ -76,6 +80,39 @@ export async function calculateRequestTokenCount(request, contentGenerator, mode
|
|
|
76
80
|
return isMedia;
|
|
77
81
|
});
|
|
78
82
|
if (hasMedia) {
|
|
83
|
+
const providerName = contentGenerator.providerName;
|
|
84
|
+
const isNonGemini = providerName != null && providerName !== 'gemini';
|
|
85
|
+
// Non-Gemini: use llmCountTokens (provider-independent path)
|
|
86
|
+
// [리뷰 #2] llmCountTokens만 체크 — isProviderIndependentGenerator()는
|
|
87
|
+
// 3개 메서드 전수 요구라 토큰 계산에는 과도
|
|
88
|
+
if (isNonGemini && typeof contentGenerator.llmCountTokens === 'function') {
|
|
89
|
+
try {
|
|
90
|
+
// NOTE: 호출자(chatCompressionService 등)가 Content[] → flatMap → Part[]로
|
|
91
|
+
// 평탄화 후 전달하므로 원래 role/tool 문맥이 소실됨.
|
|
92
|
+
// 단일 user 메시지로 감싸서 전달하며, provider가 거부 시 catch → fallback.
|
|
93
|
+
// Gemini 경로도 동일 패턴 (pre-existing limitation). [리뷰 #1]
|
|
94
|
+
const llmContents = convertPartListUnionToLlmContents(parts);
|
|
95
|
+
const request = {
|
|
96
|
+
model,
|
|
97
|
+
messages: [{ role: 'user', content: llmContents }],
|
|
98
|
+
};
|
|
99
|
+
const response = await contentGenerator.llmCountTokens(request);
|
|
100
|
+
return response.totalTokens ?? 0;
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
// [리뷰 #3] supportsTokenCount=false인 provider(OpenAI 등)는 항상 여기로
|
|
104
|
+
// 진입하여 heuristic fallback 사용. 성능 영향은 미미 (sync throw).
|
|
105
|
+
// [리뷰 #6] provider별 최초 1회만 warn 로그 출력 → 반복 경고 방지
|
|
106
|
+
const provider = contentGenerator.providerName ?? 'unknown';
|
|
107
|
+
if (!warnedProviders.has(provider)) {
|
|
108
|
+
warnedProviders.add(provider);
|
|
109
|
+
debugLogger.warn(`llmCountTokens not supported for ${provider}, using local estimate. ` +
|
|
110
|
+
`(This warning is shown once per provider.)`, error);
|
|
111
|
+
}
|
|
112
|
+
return estimateTokenCountSync(parts);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
// Gemini: use legacy countTokens
|
|
79
116
|
try {
|
|
80
117
|
const response = await contentGenerator.countTokens({
|
|
81
118
|
model,
|