@proteinjs/conversation 2.6.0 → 2.7.1

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.
Files changed (37) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/index.d.ts +1 -1
  3. package/dist/index.d.ts.map +1 -1
  4. package/dist/index.js +1 -0
  5. package/dist/index.js.map +1 -1
  6. package/dist/src/Conversation.d.ts.map +1 -1
  7. package/dist/src/Conversation.js +12 -16
  8. package/dist/src/Conversation.js.map +1 -1
  9. package/dist/src/OpenAi.js +3 -3
  10. package/dist/src/OpenAi.js.map +1 -1
  11. package/dist/src/OpenAiResponses.d.ts +41 -4
  12. package/dist/src/OpenAiResponses.d.ts.map +1 -1
  13. package/dist/src/OpenAiResponses.js +757 -77
  14. package/dist/src/OpenAiResponses.js.map +1 -1
  15. package/dist/src/OpenAiStreamProcessor.js +4 -4
  16. package/dist/src/OpenAiStreamProcessor.js.map +1 -1
  17. package/dist/src/UsageData.d.ts +39 -4
  18. package/dist/src/UsageData.d.ts.map +1 -1
  19. package/dist/src/UsageData.js +302 -11
  20. package/dist/src/UsageData.js.map +1 -1
  21. package/dist/src/fs/conversation_fs/ConversationFsModule.d.ts.map +1 -1
  22. package/dist/src/fs/conversation_fs/ConversationFsModule.js +1 -0
  23. package/dist/src/fs/conversation_fs/ConversationFsModule.js.map +1 -1
  24. package/dist/src/fs/conversation_fs/FsFunctions.d.ts +26 -0
  25. package/dist/src/fs/conversation_fs/FsFunctions.d.ts.map +1 -1
  26. package/dist/src/fs/conversation_fs/FsFunctions.js +68 -27
  27. package/dist/src/fs/conversation_fs/FsFunctions.js.map +1 -1
  28. package/index.ts +1 -1
  29. package/package.json +5 -6
  30. package/src/Conversation.ts +14 -17
  31. package/src/OpenAi.ts +3 -3
  32. package/src/OpenAiResponses.ts +905 -112
  33. package/src/OpenAiStreamProcessor.ts +3 -3
  34. package/src/UsageData.ts +376 -13
  35. package/src/fs/conversation_fs/ConversationFsModule.ts +2 -0
  36. package/src/fs/conversation_fs/FsFunctions.ts +32 -2
  37. package/LICENSE +0 -21
@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
50
50
  return (mod && mod.__esModule) ? mod : { "default": mod };
51
51
  };
52
52
  Object.defineProperty(exports, "__esModule", { value: true });
53
- exports.fsFunctions = exports.grepFunction = exports.grepFunctionName = exports.moveFunctionName = exports.copyFunctionName = exports.renameFunctionName = exports.getFilePathsMatchingGlobFunctionName = exports.fileOrDirectoryExistsFunction = exports.fileOrDirectoryExistsFunctionName = exports.getRecentlyAccessedFilePathsFunction = exports.getRecentlyAccessedFilePathsFunctionName = exports.writeFilesFunction = exports.writeFilesFunctionName = exports.readFilesFunction = exports.readFilesFunctionName = void 0;
53
+ exports.fsFunctions = exports.grepFunction = exports.grepFunctionName = exports.moveFunctionName = exports.copyFunctionName = exports.renameFunctionName = exports.getFilePathsMatchingGlobFunctionName = exports.fileOrDirectoryExistsFunction = exports.fileOrDirectoryExistsFunctionName = exports.createFolderFunction = exports.createFolderFunctionName = exports.getRecentlyAccessedFilePathsFunction = exports.getRecentlyAccessedFilePathsFunctionName = exports.deleteFilesFunction = exports.deleteFilesFunctionName = exports.writeFilesFunction = exports.writeFilesFunctionName = exports.readFilesFunction = exports.readFilesFunctionName = void 0;
54
54
  var util_node_1 = require("@proteinjs/util-node");
55
55
  var path_1 = __importDefault(require("path"));
56
56
  var toRepoAbs = function (mod, p) { return (path_1.default.isAbsolute(p) ? p : path_1.default.join(mod.getRepoPath(), p)); };
@@ -204,6 +204,47 @@ function writeFilesFunction(fsModule) {
204
204
  };
205
205
  }
206
206
  exports.writeFilesFunction = writeFilesFunction;
207
+ exports.deleteFilesFunctionName = 'deleteFiles';
208
+ function deleteFilesFunction(fsModule) {
209
+ var _this = this;
210
+ return {
211
+ definition: {
212
+ name: exports.deleteFilesFunctionName,
213
+ description: 'Delete files from the file system',
214
+ parameters: {
215
+ type: 'object',
216
+ properties: {
217
+ paths: {
218
+ type: 'array',
219
+ description: 'Paths to the files',
220
+ items: { type: 'string' },
221
+ },
222
+ },
223
+ required: ['paths'],
224
+ },
225
+ },
226
+ call: function (params) { return __awaiter(_this, void 0, void 0, function () {
227
+ var absPaths, error_3;
228
+ return __generator(this, function (_a) {
229
+ switch (_a.label) {
230
+ case 0:
231
+ _a.trys.push([0, 3, , 4]);
232
+ return [4 /*yield*/, canonicalizePaths(fsModule, params.paths)];
233
+ case 1:
234
+ absPaths = _a.sent();
235
+ return [4 /*yield*/, util_node_1.Fs.deleteFiles(absPaths)];
236
+ case 2: return [2 /*return*/, _a.sent()];
237
+ case 3:
238
+ error_3 = _a.sent();
239
+ return [2 /*return*/, error_3.message];
240
+ case 4: return [2 /*return*/];
241
+ }
242
+ });
243
+ }); },
244
+ instructions: ["To delete files from the local file system, use the ".concat(exports.deleteFilesFunctionName, " function")],
245
+ };
246
+ }
247
+ exports.deleteFilesFunction = deleteFilesFunction;
207
248
  exports.getRecentlyAccessedFilePathsFunctionName = 'getRecentlyAccessedFilePaths';
208
249
  function getRecentlyAccessedFilePathsFunction(fsModule) {
209
250
  var _this = this;
@@ -223,10 +264,10 @@ function getRecentlyAccessedFilePathsFunction(fsModule) {
223
264
  };
224
265
  }
225
266
  exports.getRecentlyAccessedFilePathsFunction = getRecentlyAccessedFilePathsFunction;
226
- var createFolderFunctionName = 'createFolder';
227
- var createFolderFunction = {
267
+ exports.createFolderFunctionName = 'createFolder';
268
+ exports.createFolderFunction = {
228
269
  definition: {
229
- name: createFolderFunctionName,
270
+ name: exports.createFolderFunctionName,
230
271
  description: 'Create a folder/directory',
231
272
  parameters: {
232
273
  type: 'object',
@@ -240,7 +281,7 @@ var createFolderFunction = {
240
281
  },
241
282
  },
242
283
  call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
243
- var error_3;
284
+ var error_4;
244
285
  return __generator(this, function (_a) {
245
286
  switch (_a.label) {
246
287
  case 0:
@@ -250,13 +291,13 @@ var createFolderFunction = {
250
291
  _a.sent();
251
292
  return [3 /*break*/, 3];
252
293
  case 2:
253
- error_3 = _a.sent();
254
- return [2 /*return*/, error_3.message];
294
+ error_4 = _a.sent();
295
+ return [2 /*return*/, error_4.message];
255
296
  case 3: return [2 /*return*/];
256
297
  }
257
298
  });
258
299
  }); },
259
- instructions: ["To create a folder on the local file system, use the ".concat(createFolderFunctionName, " function")],
300
+ instructions: ["To create a folder on the local file system, use the ".concat(exports.createFolderFunctionName, " function")],
260
301
  };
261
302
  exports.fileOrDirectoryExistsFunctionName = 'fileOrDirectoryExists';
262
303
  exports.fileOrDirectoryExistsFunction = {
@@ -275,7 +316,7 @@ exports.fileOrDirectoryExistsFunction = {
275
316
  },
276
317
  },
277
318
  call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
278
- var error_4;
319
+ var error_5;
279
320
  return __generator(this, function (_a) {
280
321
  switch (_a.label) {
281
322
  case 0:
@@ -283,8 +324,8 @@ exports.fileOrDirectoryExistsFunction = {
283
324
  return [4 /*yield*/, util_node_1.Fs.exists(params.path)];
284
325
  case 1: return [2 /*return*/, _a.sent()];
285
326
  case 2:
286
- error_4 = _a.sent();
287
- return [2 /*return*/, error_4.message];
327
+ error_5 = _a.sent();
328
+ return [2 /*return*/, error_5.message];
288
329
  case 3: return [2 /*return*/];
289
330
  }
290
331
  });
@@ -321,7 +362,7 @@ var getFilePathsMatchingGlobFunction = {
321
362
  },
322
363
  },
323
364
  call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
324
- var error_5;
365
+ var error_6;
325
366
  return __generator(this, function (_a) {
326
367
  switch (_a.label) {
327
368
  case 0:
@@ -331,8 +372,8 @@ var getFilePathsMatchingGlobFunction = {
331
372
  _a.sent();
332
373
  return [3 /*break*/, 3];
333
374
  case 2:
334
- error_5 = _a.sent();
335
- return [2 /*return*/, error_5.message];
375
+ error_6 = _a.sent();
376
+ return [2 /*return*/, error_6.message];
336
377
  case 3: return [2 /*return*/];
337
378
  }
338
379
  });
@@ -360,7 +401,7 @@ var renameFunction = {
360
401
  },
361
402
  },
362
403
  call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
363
- var error_6;
404
+ var error_7;
364
405
  return __generator(this, function (_a) {
365
406
  switch (_a.label) {
366
407
  case 0:
@@ -370,8 +411,8 @@ var renameFunction = {
370
411
  _a.sent();
371
412
  return [3 /*break*/, 3];
372
413
  case 2:
373
- error_6 = _a.sent();
374
- return [2 /*return*/, error_6.message];
414
+ error_7 = _a.sent();
415
+ return [2 /*return*/, error_7.message];
375
416
  case 3: return [2 /*return*/];
376
417
  }
377
418
  });
@@ -399,7 +440,7 @@ var copyFunction = {
399
440
  },
400
441
  },
401
442
  call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
402
- var error_7;
443
+ var error_8;
403
444
  return __generator(this, function (_a) {
404
445
  switch (_a.label) {
405
446
  case 0:
@@ -409,8 +450,8 @@ var copyFunction = {
409
450
  _a.sent();
410
451
  return [3 /*break*/, 3];
411
452
  case 2:
412
- error_7 = _a.sent();
413
- return [2 /*return*/, error_7.message];
453
+ error_8 = _a.sent();
454
+ return [2 /*return*/, error_8.message];
414
455
  case 3: return [2 /*return*/];
415
456
  }
416
457
  });
@@ -438,7 +479,7 @@ var moveFunction = {
438
479
  },
439
480
  },
440
481
  call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
441
- var error_8;
482
+ var error_9;
442
483
  return __generator(this, function (_a) {
443
484
  switch (_a.label) {
444
485
  case 0:
@@ -448,8 +489,8 @@ var moveFunction = {
448
489
  _a.sent();
449
490
  return [3 /*break*/, 3];
450
491
  case 2:
451
- error_8 = _a.sent();
452
- return [2 /*return*/, error_8.message];
492
+ error_9 = _a.sent();
493
+ return [2 /*return*/, error_9.message];
453
494
  case 3: return [2 /*return*/];
454
495
  }
455
496
  });
@@ -483,7 +524,7 @@ function grepFunction(fsModule) {
483
524
  },
484
525
  },
485
526
  call: function (params) { return __awaiter(_this, void 0, void 0, function () {
486
- var repo, cwd, error_9;
527
+ var repo, cwd, error_10;
487
528
  return __generator(this, function (_a) {
488
529
  switch (_a.label) {
489
530
  case 0:
@@ -495,8 +536,8 @@ function grepFunction(fsModule) {
495
536
  return [4 /*yield*/, util_node_1.Fs.grep({ pattern: params.pattern, dir: cwd, maxResults: params.maxResults })];
496
537
  case 2: return [2 /*return*/, _a.sent()];
497
538
  case 3:
498
- error_9 = _a.sent();
499
- return [2 /*return*/, error_9.message];
539
+ error_10 = _a.sent();
540
+ return [2 /*return*/, error_10.message];
500
541
  case 4: return [2 /*return*/];
501
542
  }
502
543
  });
@@ -510,7 +551,7 @@ function grepFunction(fsModule) {
510
551
  }
511
552
  exports.grepFunction = grepFunction;
512
553
  exports.fsFunctions = [
513
- createFolderFunction,
554
+ exports.createFolderFunction,
514
555
  exports.fileOrDirectoryExistsFunction,
515
556
  getFilePathsMatchingGlobFunction,
516
557
  renameFunction,
@@ -1 +1 @@
1
- {"version":3,"file":"FsFunctions.js","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/FsFunctions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FsFunctions.js","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/FsFunctions.ts"],"names":[],"mappings":"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"}
package/index.ts CHANGED
@@ -11,7 +11,7 @@ export * from './src/history/MessageModerator';
11
11
  export * from './src/history/MessageHistory';
12
12
  export * from './src/ChatCompletionMessageParamFactory';
13
13
  export { AssistantResponseStreamChunk } from './src/OpenAiStreamProcessor';
14
- export { UsageData, TokenUsage } from './src/UsageData';
14
+ export * from './src/UsageData';
15
15
  export * from './src/OpenAiResponses';
16
16
 
17
17
  // Conversation modules
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@proteinjs/conversation",
3
- "version": "2.6.0",
3
+ "version": "2.7.1",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "publishConfig": {
@@ -28,15 +28,14 @@
28
28
  "ts-jest": "^29.1.1"
29
29
  },
30
30
  "dependencies": {
31
- "@proteinjs/logger": "1.0.12",
31
+ "@proteinjs/logger": "1.0.14",
32
32
  "@proteinjs/util": "1.5.0",
33
- "@proteinjs/util-node": "1.6.0",
33
+ "@proteinjs/util-node": "1.7.1",
34
34
  "ai": "6.0.14",
35
35
  "fs-extra": "11.1.1",
36
36
  "openai": "6.16.0",
37
37
  "readline-sync": "1.4.10",
38
- "tiktoken": "1.0.15",
38
+ "tiktoken": "1.0.22",
39
39
  "typescript": "5.2.2"
40
- },
41
- "gitHead": "80c5c89afbda6ccd8c708d20b16bc85fdc22002b"
40
+ }
42
41
  }
@@ -9,8 +9,8 @@ import { MessageModerator } from './history/MessageModerator';
9
9
  import { ConversationModule } from './ConversationModule';
10
10
  import { TiktokenModel, encoding_for_model } from 'tiktoken';
11
11
  import { searchLibrariesFunctionName } from './fs/package/PackageFunctions';
12
- import { UsageData } from './UsageData';
13
- import type { ModelMessage, LanguageModel } from 'ai';
12
+ import { UsageData, UsageDataAccumulator } from './UsageData';
13
+ import type { ModelMessage, LanguageModel, GenerateObjectResult, JSONValue } from 'ai';
14
14
  import { generateObject as aiGenerateObject, jsonSchema } from 'ai';
15
15
 
16
16
  export type ConversationParams = {
@@ -527,15 +527,14 @@ export class Conversation {
527
527
  // ---- Usage + provider metadata normalization ----
528
528
 
529
529
  private processUsageData(args: {
530
- result: any;
530
+ result: GenerateObjectResult<JSONValue>;
531
531
  model?: LanguageModel;
532
532
  toolCounts?: Map<string, number>;
533
533
  toolLedgerLen?: number;
534
534
  }): UsageData {
535
535
  const { result, model, toolCounts, toolLedgerLen } = args;
536
536
 
537
- // Try several shapes used by AI SDK / providers
538
- const u: any = result?.usage ?? result?.response?.usage ?? result?.response?.metadata?.usage;
537
+ const u = result?.usage;
539
538
 
540
539
  // Provider-specific extras (OpenAI Responses variants)
541
540
  const { cachedInputTokens, reasoningTokens } = this.extractOpenAiUsageDetails?.(result) ?? {};
@@ -547,29 +546,27 @@ export class Conversation {
547
546
  const cached = Number.isFinite(cachedInputTokens) ? Number(cachedInputTokens) : 0;
548
547
 
549
548
  // Resolve model id for pricing/telemetry
550
- const modelId: any =
551
- (model as any)?.modelId ??
552
- result?.response?.providerMetadata?.openai?.model ??
553
- result?.providerMetadata?.openai?.model ??
554
- result?.response?.model ??
555
- undefined;
549
+ const modelId: any = model?.toString();
550
+
551
+ const resolvedModel = typeof modelId === 'string' && modelId.trim().length > 0 ? modelId : 'unknown';
556
552
 
557
553
  const tokenUsage = {
558
- promptTokens: input,
554
+ inputTokens: input,
559
555
  reasoningTokens: reasoning,
560
- cachedPromptTokens: cached,
561
- completionTokens: output,
556
+ cachedInputTokens: cached,
557
+ outputTokens: output,
562
558
  totalTokens: total,
563
559
  };
564
560
 
561
+ const uda = new UsageDataAccumulator({ model: modelId });
562
+ uda.addTokenUsage(tokenUsage);
563
+
565
564
  const callsPerTool = toolCounts ? Object.fromEntries(toolCounts) : {};
566
565
  const totalToolCalls =
567
566
  typeof toolLedgerLen === 'number' ? toolLedgerLen : Object.values(callsPerTool).reduce((a, b) => a + (b || 0), 0);
568
567
 
569
568
  return {
570
- model: modelId,
571
- initialRequestTokenUsage: { ...tokenUsage },
572
- totalTokenUsage: { ...tokenUsage },
569
+ ...uda.usageData,
573
570
  totalRequestsToAssistant: 1,
574
571
  totalToolCalls,
575
572
  callsPerTool,
package/src/OpenAi.ts CHANGED
@@ -339,10 +339,10 @@ export class OpenAi {
339
339
  if (response.usage) {
340
340
  logger.info({ message: `Usage data`, obj: { usageData: response.usage } });
341
341
  usageDataAccumulator.addTokenUsage({
342
- promptTokens: response.usage.prompt_tokens,
342
+ inputTokens: response.usage.prompt_tokens,
343
343
  reasoningTokens: response.usage.completion_tokens_details?.reasoning_tokens ?? 0,
344
- cachedPromptTokens: response.usage.prompt_tokens_details?.cached_tokens ?? 0,
345
- completionTokens: response.usage.completion_tokens,
344
+ cachedInputTokens: response.usage.prompt_tokens_details?.cached_tokens ?? 0,
345
+ outputTokens: response.usage.completion_tokens,
346
346
  totalTokens: response.usage.total_tokens,
347
347
  });
348
348
  } else {