@proteinjs/conversation 2.5.0 → 2.7.0

package/dist/src/fs/conversation_fs/ConversationFsModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationFsModule.d.ts","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/ConversationFsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAe1C,qBAAa,oBAAqB,YAAW,kBAAkB;IAC7D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,yBAAyB,CAAgB;gBAErC,QAAQ,EAAE,MAAM;IAI5B,OAAO,IAAI,MAAM;IAIjB,iBAAiB,IAAI,MAAM,EAAE;IAgB7B,YAAY,IAAI,QAAQ,EAAE;IAU1B,oBAAoB;IAKpB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE;IAIhD,4BAA4B;IAI5B,WAAW,IAAI,MAAM;CAGtB;AAED,qBAAa,2BAA4B,YAAW,yBAAyB;IACrE,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAGpE"}
+{"version":3,"file":"ConversationFsModule.d.ts","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/ConversationFsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAgB1C,qBAAa,oBAAqB,YAAW,kBAAkB;IAC7D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,yBAAyB,CAAgB;gBAErC,QAAQ,EAAE,MAAM;IAI5B,OAAO,IAAI,MAAM;IAIjB,iBAAiB,IAAI,MAAM,EAAE;IAgB7B,YAAY,IAAI,QAAQ,EAAE;IAW1B,oBAAoB;IAKpB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE;IAIhD,4BAA4B;IAI5B,WAAW,IAAI,MAAM;CAGtB;AAED,qBAAa,2BAA4B,YAAW,yBAAyB;IACrE,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAGpE"}

package/dist/src/fs/conversation_fs/ConversationFsModule.js

@@ -76,6 +76,7 @@ var ConversationFsModule = /** @class */ (function () {
         return __spreadArray([
             (0, FsFunctions_1.readFilesFunction)(this),
             (0, FsFunctions_1.writeFilesFunction)(this),
+            (0, FsFunctions_1.deleteFilesFunction)(this),
             (0, FsFunctions_1.getRecentlyAccessedFilePathsFunction)(this),
             (0, FsFunctions_1.grepFunction)(this)
         ], FsFunctions_1.fsFunctions, true);

package/dist/src/fs/conversation_fs/ConversationFsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationFsModule.js","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/ConversationFsModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uGAAiG;AACjG,gEAAsG;AAEtG,6CASuB;AAEvB;IAIE,8BAAY,QAAgB;QAFpB,8BAAyB,GAAa,EAAE,CAAC;QAG/C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,sCAAO,GAAP;QACE,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,gDAAiB,GAAjB;QACE,OAAO;YACL,mDAA4C,IAAI,CAAC,QAAQ,kCAA+B;YACxF,+IAA+I;YAC/I,oGAAoG;YACpG,0DAAmD,6CAA0B,2FAAwF;YACrK,oHAA6G,mCAAqB,+BAAqB,oCAAsB,cAAW;YACxL,yGAAyG;YACzG,6HAA6H;YAC7H,sFAAsF;YACtF,wEAAiE,sDAAuB,yBAAsB;YAC9G,+GAAwG,8BAAgB,2DAAiD,6CAA0B,eAAK,sDAAuB,CAAE;YACjO,gHAAyG,mCAAqB,gCAA6B;SAC5J,CAAC;IACJ,CAAC;IAED,2CAAY,GAAZ;QACE;YACE,IAAA,+BAAiB,EAAC,IAAI,CAAC;YACvB,IAAA,gCAAkB,EAAC,IAAI,CAAC;YACxB,IAAA,kDAAoC,EAAC,IAAI,CAAC;YAC1C,IAAA,0BAAY,EAAC,IAAI,CAAC;WACf,yBAAW,QACd;IACJ,CAAC;IAED,mDAAoB,GAApB;QACE,0CAA0C;QAC1C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,2DAA4B,GAA5B,UAA6B,SAAmB;;QAC9C,CAAA,KAAA,IAAI,CAAC,yBAAyB,CAAA,CAAC,IAAI,WAAI,SAAS,EAAE;IACpD,CAAC;IAED,2DAA4B,GAA5B;QACE,OAAO,IAAI,CAAC,yBAAyB,CAAC;IACxC,CAAC;IAED,0CAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACH,2BAAC;AAAD,CAAC,AAtDD,IAsDC;AAtDY,oDAAoB;AAwDjC;IAAA;IAIA,CAAC;IAHO,kDAAY,GAAlB,UAAmB,QAAgB;;;gBACjC,sBAAO,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAC;;;KAC3C;IACH,kCAAC;AAAD,CAAC,AAJD,IAIC;AAJY,kEAA2B"}
+{"version":3,"file":"ConversationFsModule.js","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/ConversationFsModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uGAAiG;AACjG,gEAAsG;AAEtG,6CAUuB;AAEvB;IAIE,8BAAY,QAAgB;QAFpB,8BAAyB,GAAa,EAAE,CAAC;QAG/C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,sCAAO,GAAP;QACE,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,gDAAiB,GAAjB;QACE,OAAO;YACL,mDAA4C,IAAI,CAAC,QAAQ,kCAA+B;YACxF,+IAA+I;YAC/I,oGAAoG;YACpG,0DAAmD,6CAA0B,2FAAwF;YACrK,oHAA6G,mCAAqB,+BAAqB,oCAAsB,cAAW;YACxL,yGAAyG;YACzG,6HAA6H;YAC7H,sFAAsF;YACtF,wEAAiE,sDAAuB,yBAAsB;YAC9G,+GAAwG,8BAAgB,2DAAiD,6CAA0B,eAAK,sDAAuB,CAAE;YACjO,gHAAyG,mCAAqB,gCAA6B;SAC5J,CAAC;IACJ,CAAC;IAED,2CAAY,GAAZ;QACE;YACE,IAAA,+BAAiB,EAAC,IAAI,CAAC;YACvB,IAAA,gCAAkB,EAAC,IAAI,CAAC;YACxB,IAAA,iCAAmB,EAAC,IAAI,CAAC;YACzB,IAAA,kDAAoC,EAAC,IAAI,CAAC;YAC1C,IAAA,0BAAY,EAAC,IAAI,CAAC;WACf,yBAAW,QACd;IACJ,CAAC;IAED,mDAAoB,GAApB;QACE,0CAA0C;QAC1C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,2DAA4B,GAA5B,UAA6B,SAAmB;;QAC9C,CAAA,KAAA,IAAI,CAAC,yBAAyB,CAAA,CAAC,IAAI,WAAI,SAAS,EAAE;IACpD,CAAC;IAED,2DAA4B,GAA5B;QACE,OAAO,IAAI,CAAC,yBAAyB,CAAC;IACxC,CAAC;IAED,0CAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACH,2BAAC;AAAD,CAAC,AAvDD,IAuDC;AAvDY,oDAAoB;AAyDjC;IAAA;IAIA,CAAC;IAHO,kDAAY,GAAlB,UAAmB,QAAgB;;;gBACjC,sBAAO,IAAI,oBAAoB,CAAC,QAAQ,CAAC,EAAC;;;KAC3C;IACH,kCAAC;AAAD,CAAC,AAJD,IAIC;AAJY,kEAA2B"}

package/dist/src/fs/conversation_fs/FsFunctions.d.ts

@@ -57,6 +57,30 @@ export declare function writeFilesFunction(fsModule: ConversationFsModule): {
     }) => Promise<any>;
     instructions: string[];
 };
+export declare const deleteFilesFunctionName = "deleteFiles";
+export declare function deleteFilesFunction(fsModule: ConversationFsModule): {
+    definition: {
+        name: string;
+        description: string;
+        parameters: {
+            type: string;
+            properties: {
+                paths: {
+                    type: string;
+                    description: string;
+                    items: {
+                        type: string;
+                    };
+                };
+            };
+            required: string[];
+        };
+    };
+    call: (params: {
+        paths: string[];
+    }) => Promise<any>;
+    instructions: string[];
+};
 export declare const getRecentlyAccessedFilePathsFunctionName = "getRecentlyAccessedFilePaths";
 export declare function getRecentlyAccessedFilePathsFunction(fsModule: ConversationFsModule): {
     definition: {
@@ -70,6 +94,8 @@ export declare function getRecentlyAccessedFilePathsFunction(fsModule: Conversat
     };
     call: () => Promise<string[]>;
 };
+export declare const createFolderFunctionName = "createFolder";
+export declare const createFolderFunction: Function;
 export declare const fileOrDirectoryExistsFunctionName = "fileOrDirectoryExists";
 export declare const fileOrDirectoryExistsFunction: Function;
 export declare const getFilePathsMatchingGlobFunctionName = "getFilePathsMatchingGlob";

package/dist/src/fs/conversation_fs/FsFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FsFunctions.d.ts","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/FsFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAM,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AA8C9D,eAAO,MAAM,qBAAqB,cAAc,CAAC;AACjD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;mBAiBvC;QAAE,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE;;EAW/C;AAED,eAAO,MAAM,sBAAsB,eAAe,CAAC;AACnD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;mBAoBxC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAA;KAAE;;EAezC;AAED,eAAO,MAAM,wCAAwC,iCAAiC,CAAC;AACvF,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;EAalF;AA4BD,eAAO,MAAM,iCAAiC,0BAA0B,CAAC;AACzE,eAAO,MAAM,6BAA6B,EAAE,QAyB3C,CAAC;AAEF,eAAO,MAAM,oCAAoC,6BAA6B,CAAC;AAqC/E,eAAO,MAAM,kBAAkB,0BAA0B,CAAC;AA8B1D,eAAO,MAAM,gBAAgB,wBAAwB,CAAC;AA8BtD,eAAO,MAAM,gBAAgB,wBAAwB,CAAC;AA8BtD,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;mBA2BlC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;;EAe9E;AAED,eAAO,MAAM,WAAW,EAAE,QAAQ,EAOjC,CAAC"}
+{"version":3,"file":"FsFunctions.d.ts","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/FsFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAM,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AA8C9D,eAAO,MAAM,qBAAqB,cAAc,CAAC;AACjD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;mBAiBvC;QAAE,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE;;EAW/C;AAED,eAAO,MAAM,sBAAsB,eAAe,CAAC;AACnD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;mBAoBxC;QAAE,KAAK,EAAE,IAAI,EAAE,CAAA;KAAE;;EAezC;AAED,eAAO,MAAM,uBAAuB,gBAAgB,CAAC;AACrD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;mBAiBzC;QAAE,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE;;EAU3C;AAED,eAAO,MAAM,wCAAwC,iCAAiC,CAAC;AACvF,wBAAgB,oCAAoC,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;EAalF;AAED,eAAO,MAAM,wBAAwB,iBAAiB,CAAC;AACvD,eAAO,MAAM,oBAAoB,EAAE,QAuBlC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0BAA0B,CAAC;AACzE,eAAO,MAAM,6BAA6B,EAAE,QAyB3C,CAAC;AAEF,eAAO,MAAM,oCAAoC,6BAA6B,CAAC;AAqC/E,eAAO,MAAM,kBAAkB,0BAA0B,CAAC;AA8B1D,eAAO,MAAM,gBAAgB,wBAAwB,CAAC;AA8BtD,eAAO,MAAM,gBAAgB,wBAAwB,CAAC;AA8BtD,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;mBA2BlC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;;EAe9E;AAED,eAAO,MAAM,WAAW,EAAE,QAAQ,EAOjC,CAAC"}

package/dist/src/fs/conversation_fs/FsFunctions.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 var util_node_1 = require("@proteinjs/util-node");
 var path_1 = __importDefault(require("path"));
 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) {
     };
 }
 exports.writeFilesFunction = writeFilesFunction;
+exports.deleteFilesFunctionName = 'deleteFiles';
+function deleteFilesFunction(fsModule) {
+    var _this = this;
+    return {
+        definition: {
+            name: exports.deleteFilesFunctionName,
+            description: 'Delete files from the file system',
+            parameters: {
+                type: 'object',
+                properties: {
+                    paths: {
+                        type: 'array',
+                        description: 'Paths to the files',
+                        items: { type: 'string' },
+                    },
+                },
+                required: ['paths'],
+            },
+        },
+        call: function (params) { return __awaiter(_this, void 0, void 0, function () {
+            var absPaths, error_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, canonicalizePaths(fsModule, params.paths)];
+                    case 1:
+                        absPaths = _a.sent();
+                        return [4 /*yield*/, util_node_1.Fs.deleteFiles(absPaths)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_3 = _a.sent();
+                        return [2 /*return*/, error_3.message];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); },
+        instructions: ["To delete files from the local file system, use the ".concat(exports.deleteFilesFunctionName, " function")],
+    };
+}
+exports.deleteFilesFunction = deleteFilesFunction;
 exports.getRecentlyAccessedFilePathsFunctionName = 'getRecentlyAccessedFilePaths';
 function getRecentlyAccessedFilePathsFunction(fsModule) {
     var _this = this;
@@ -223,10 +264,10 @@ function getRecentlyAccessedFilePathsFunction(fsModule) {
     };
 }
 exports.getRecentlyAccessedFilePathsFunction = getRecentlyAccessedFilePathsFunction;
-var createFolderFunctionName = 'createFolder';
-var createFolderFunction = {
+exports.createFolderFunctionName = 'createFolder';
+exports.createFolderFunction = {
     definition: {
-        name: createFolderFunctionName,
+        name: exports.createFolderFunctionName,
         description: 'Create a folder/directory',
         parameters: {
             type: 'object',
@@ -240,7 +281,7 @@ var createFolderFunction = {
         },
     },
     call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var error_3;
+        var error_4;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -250,13 +291,13 @@ var createFolderFunction = {
                     _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    error_3 = _a.sent();
-                    return [2 /*return*/, error_3.message];
+                    error_4 = _a.sent();
+                    return [2 /*return*/, error_4.message];
                 case 3: return [2 /*return*/];
             }
         });
     }); },
-    instructions: ["To create a folder on the local file system, use the ".concat(createFolderFunctionName, " function")],
+    instructions: ["To create a folder on the local file system, use the ".concat(exports.createFolderFunctionName, " function")],
 };
 exports.fileOrDirectoryExistsFunctionName = 'fileOrDirectoryExists';
 exports.fileOrDirectoryExistsFunction = {
@@ -275,7 +316,7 @@ exports.fileOrDirectoryExistsFunction = {
         },
     },
     call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var error_4;
+        var error_5;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -283,8 +324,8 @@ exports.fileOrDirectoryExistsFunction = {
                     return [4 /*yield*/, util_node_1.Fs.exists(params.path)];
                 case 1: return [2 /*return*/, _a.sent()];
                 case 2:
-                    error_4 = _a.sent();
-                    return [2 /*return*/, error_4.message];
+                    error_5 = _a.sent();
+                    return [2 /*return*/, error_5.message];
                 case 3: return [2 /*return*/];
             }
         });
@@ -321,7 +362,7 @@ var getFilePathsMatchingGlobFunction = {
         },
     },
     call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var error_5;
+        var error_6;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -331,8 +372,8 @@ var getFilePathsMatchingGlobFunction = {
                     _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    error_5 = _a.sent();
-                    return [2 /*return*/, error_5.message];
+                    error_6 = _a.sent();
+                    return [2 /*return*/, error_6.message];
                 case 3: return [2 /*return*/];
             }
         });
@@ -360,7 +401,7 @@ var renameFunction = {
         },
     },
     call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var error_6;
+        var error_7;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -370,8 +411,8 @@ var renameFunction = {
                     _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    error_6 = _a.sent();
-                    return [2 /*return*/, error_6.message];
+                    error_7 = _a.sent();
+                    return [2 /*return*/, error_7.message];
                 case 3: return [2 /*return*/];
             }
         });
@@ -399,7 +440,7 @@ var copyFunction = {
         },
     },
     call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var error_7;
+        var error_8;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -409,8 +450,8 @@ var copyFunction = {
                     _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    error_7 = _a.sent();
-                    return [2 /*return*/, error_7.message];
+                    error_8 = _a.sent();
+                    return [2 /*return*/, error_8.message];
                 case 3: return [2 /*return*/];
             }
         });
@@ -438,7 +479,7 @@ var moveFunction = {
         },
     },
     call: function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var error_8;
+        var error_9;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -448,8 +489,8 @@ var moveFunction = {
                     _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
-                    error_8 = _a.sent();
-                    return [2 /*return*/, error_8.message];
+                    error_9 = _a.sent();
+                    return [2 /*return*/, error_9.message];
                 case 3: return [2 /*return*/];
             }
         });
@@ -483,7 +524,7 @@ function grepFunction(fsModule) {
             },
         },
         call: function (params) { return __awaiter(_this, void 0, void 0, function () {
-            var repo, cwd, error_9;
+            var repo, cwd, error_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -495,8 +536,8 @@ function grepFunction(fsModule) {
                         return [4 /*yield*/, util_node_1.Fs.grep({ pattern: params.pattern, dir: cwd, maxResults: params.maxResults })];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_9 = _a.sent();
-                        return [2 /*return*/, error_9.message];
+                        error_10 = _a.sent();
+                        return [2 /*return*/, error_10.message];
                     case 4: return [2 /*return*/];
                 }
             });
@@ -510,7 +551,7 @@ function grepFunction(fsModule) {
 }
 exports.grepFunction = grepFunction;
 exports.fsFunctions = [
-    createFolderFunction,
+    exports.createFolderFunction,
     exports.fileOrDirectoryExistsFunction,
     getFilePathsMatchingGlobFunction,
     renameFunction,

package/dist/src/fs/conversation_fs/FsFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"FsFunctions.js","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/FsFunctions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FsFunctions.js","sourceRoot":"","sources":["../../../../src/fs/conversation_fs/FsFunctions.ts"],"names":[],"mappings":"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"}

package/index.ts

@@ -11,7 +11,8 @@ export * from './src/history/MessageModerator';
 export * from './src/history/MessageHistory';
 export * from './src/ChatCompletionMessageParamFactory';
 export { AssistantResponseStreamChunk } from './src/OpenAiStreamProcessor';
-export { UsageData, TokenUsage } from './src/UsageData';
+export * from './src/UsageData';
+export * from './src/OpenAiResponses';
 
 // Conversation modules
 export * from './src/fs/conversation_fs/ConversationFsModule';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proteinjs/conversation",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
@@ -30,13 +30,13 @@
   "dependencies": {
     "@proteinjs/logger": "1.0.12",
     "@proteinjs/util": "1.5.0",
-    "@proteinjs/util-node": "1.6.0",
+    "@proteinjs/util-node": "1.7.1",
     "ai": "6.0.14",
     "fs-extra": "11.1.1",
     "openai": "6.16.0",
     "readline-sync": "1.4.10",
-    "tiktoken": "1.0.15",
+    "tiktoken": "1.0.22",
     "typescript": "5.2.2"
   },
-  "gitHead": "6cae09afb8b4872bee1547a33f8139d0d6735fa8"
+  "gitHead": "d70e67ce842898cceb63bc321ab15f3ce62a1f32"
 }

package/src/Conversation.ts

@@ -9,8 +9,8 @@ import { MessageModerator } from './history/MessageModerator';
 import { ConversationModule } from './ConversationModule';
 import { TiktokenModel, encoding_for_model } from 'tiktoken';
 import { searchLibrariesFunctionName } from './fs/package/PackageFunctions';
-import { UsageData } from './UsageData';
-import type { ModelMessage, LanguageModel } from 'ai';
+import { UsageData, UsageDataAccumulator } from './UsageData';
+import type { ModelMessage, LanguageModel, GenerateObjectResult, JSONValue } from 'ai';
 import { generateObject as aiGenerateObject, jsonSchema } from 'ai';
 
 export type ConversationParams = {
@@ -527,15 +527,14 @@ export class Conversation {
   // ---- Usage + provider metadata normalization ----
 
   private processUsageData(args: {
-    result: any;
+    result: GenerateObjectResult<JSONValue>;
     model?: LanguageModel;
     toolCounts?: Map<string, number>;
     toolLedgerLen?: number;
   }): UsageData {
     const { result, model, toolCounts, toolLedgerLen } = args;
 
-    // Try several shapes used by AI SDK / providers
-    const u: any = result?.usage ?? result?.response?.usage ?? result?.response?.metadata?.usage;
+    const u = result?.usage;
 
     // Provider-specific extras (OpenAI Responses variants)
     const { cachedInputTokens, reasoningTokens } = this.extractOpenAiUsageDetails?.(result) ?? {};
@@ -547,29 +546,27 @@ export class Conversation {
     const cached = Number.isFinite(cachedInputTokens) ? Number(cachedInputTokens) : 0;
 
     // Resolve model id for pricing/telemetry
-    const modelId: any =
-      (model as any)?.modelId ??
-      result?.response?.providerMetadata?.openai?.model ??
-      result?.providerMetadata?.openai?.model ??
-      result?.response?.model ??
-      undefined;
+    const modelId: any = model?.toString();
+
+    const resolvedModel = typeof modelId === 'string' && modelId.trim().length > 0 ? modelId : 'unknown';
 
     const tokenUsage = {
-      promptTokens: input,
+      inputTokens: input,
       reasoningTokens: reasoning,
-      cachedPromptTokens: cached,
-      completionTokens: output,
+      cachedInputTokens: cached,
+      outputTokens: output,
       totalTokens: total,
     };
 
+    const uda = new UsageDataAccumulator({ model: modelId });
+    uda.addTokenUsage(tokenUsage);
+
     const callsPerTool = toolCounts ? Object.fromEntries(toolCounts) : {};
     const totalToolCalls =
       typeof toolLedgerLen === 'number' ? toolLedgerLen : Object.values(callsPerTool).reduce((a, b) => a + (b || 0), 0);
 
     return {
-      model: modelId,
-      initialRequestTokenUsage: { ...tokenUsage },
-      totalTokenUsage: { ...tokenUsage },
+      ...uda.usageData,
       totalRequestsToAssistant: 1,
       totalToolCalls,
       callsPerTool,

package/src/OpenAi.ts

@@ -339,10 +339,10 @@ export class OpenAi {
     if (response.usage) {
       logger.info({ message: `Usage data`, obj: { usageData: response.usage } });
       usageDataAccumulator.addTokenUsage({
-        promptTokens: response.usage.prompt_tokens,
+        inputTokens: response.usage.prompt_tokens,
         reasoningTokens: response.usage.completion_tokens_details?.reasoning_tokens ?? 0,
-        cachedPromptTokens: response.usage.prompt_tokens_details?.cached_tokens ?? 0,
-        completionTokens: response.usage.completion_tokens,
+        cachedInputTokens: response.usage.prompt_tokens_details?.cached_tokens ?? 0,
+        outputTokens: response.usage.completion_tokens,
         totalTokens: response.usage.total_tokens,
       });
     } else {