@appland/appmap 3.148.0 → 3.149.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/built/cmds/navie.js +9 -1
- package/built/cmds/navie.js.map +1 -1
- package/built/fulltext/FileIndex.js +7 -5
- package/built/fulltext/FileIndex.js.map +1 -1
- package/built/rpc/explain/collectContext.js +4 -2
- package/built/rpc/explain/collectContext.js.map +1 -1
- package/built/rpc/explain/explain.js +7 -6
- package/built/rpc/explain/explain.js.map +1 -1
- package/built/rpc/explain/navie/navie-local.js +2 -1
- package/built/rpc/explain/navie/navie-local.js.map +1 -1
- package/built/rpc/explain/navie/navie-remote.js +4 -1
- package/built/rpc/explain/navie/navie-remote.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
# [@appland/appmap-v3.149.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.148.0...@appland/appmap-v3.149.0) (2024-06-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* --prompt and /noterms options ([9802fdc](https://github.com/getappmap/appmap-js/commit/9802fdc9baded47ccc565ed6f4fb79850f1d3ad6))
|
|
7
|
+
* Exclude context by file pattern ([0ad604a](https://github.com/getappmap/appmap-js/commit/0ad604a99ac745326facefaf0ad4c2990a9ae813))
|
|
8
|
+
|
|
1
9
|
# [@appland/appmap-v3.148.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.147.1...@appland/appmap-v3.148.0) (2024-06-11)
|
|
2
10
|
|
|
3
11
|
|
package/built/cmds/navie.js
CHANGED
|
@@ -66,6 +66,11 @@ function commonNavieArgsBuilder(args) {
|
|
|
66
66
|
})
|
|
67
67
|
.option('agent-mode', {
|
|
68
68
|
describe: `This option is deprecated. Instead, start your question with @<command | agent>.`,
|
|
69
|
+
})
|
|
70
|
+
.option('prompt', {
|
|
71
|
+
describe: 'A file containing custom system prompts to send to the LLM',
|
|
72
|
+
alias: 'p',
|
|
73
|
+
type: 'string',
|
|
69
74
|
})
|
|
70
75
|
.option('code-editor', {
|
|
71
76
|
describe: 'Active code editor. This information is used to tune the @help responses. If unspecified, the code editor may be picked up from environment variables APPMAP_CODE_EDITOR, TERM_PROGRAM and TERMINAL_EMULATOR.',
|
|
@@ -188,12 +193,15 @@ async function handler(argv) {
|
|
|
188
193
|
let codeSelection;
|
|
189
194
|
if (argv.codeSelection)
|
|
190
195
|
codeSelection = await (0, promises_1.readFile)(argv.codeSelection, 'utf-8');
|
|
196
|
+
let prompt;
|
|
197
|
+
if (argv.prompt)
|
|
198
|
+
prompt = await (0, promises_1.readFile)(argv.prompt, 'utf-8');
|
|
191
199
|
const question = await getQuestion(argv.input, argv.question);
|
|
192
200
|
const capturingProvider = (...args) => attachNavie(buildNavieProvider(argv)(...args));
|
|
193
201
|
// WIP: Help the @apply command to resolve paths
|
|
194
202
|
if (argv.directory.length === 1)
|
|
195
203
|
process.chdir(argv.directory[0]);
|
|
196
|
-
await (0, explain_1.explainHandler)(capturingProvider, codeEditor).handler({ question, codeSelection });
|
|
204
|
+
await (0, explain_1.explainHandler)(capturingProvider, codeEditor).handler({ question, codeSelection, prompt });
|
|
197
205
|
}
|
|
198
206
|
exports.handler = handler;
|
|
199
207
|
function openOutput(outputPath) {
|
package/built/cmds/navie.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navie.js","sourceRoot":"","sources":["../../src/cmds/navie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoC;AACpC,qCAA4C;AAC5C,+CAA4C;AAE5C,qDAA6C;AAE7C,kDAA0B;AAG1B,4CAAoD;AAIpD,0EAAwE;AACxE,oDAAwD;AAExD,mFAA0D;AAC1D,qFAA4D;AAC5D,6DAAmE;AACnE,+EAAuD;
|
|
1
|
+
{"version":3,"file":"navie.js","sourceRoot":"","sources":["../../src/cmds/navie.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ class FileIndex {
|
|
|
84
84
|
score: row.score,
|
|
85
85
|
}));
|
|
86
86
|
}
|
|
87
|
-
async indexDirectories(directories, batchSize = 100) {
|
|
87
|
+
async indexDirectories(directories, excludePatterns, batchSize = 100) {
|
|
88
88
|
for (const directory of directories) {
|
|
89
89
|
try {
|
|
90
90
|
const startTime = new Date().getTime();
|
|
@@ -92,7 +92,7 @@ class FileIndex {
|
|
|
92
92
|
const fileNames = gitState === telemetry_1.GitState.Ok
|
|
93
93
|
? await (0, listGitProjectFIles_1.default)(directory)
|
|
94
94
|
: await (0, listProjectFiles_1.default)(directory);
|
|
95
|
-
const filteredFileNames = await filterFiles(directory, fileNames);
|
|
95
|
+
const filteredFileNames = await filterFiles(directory, fileNames, excludePatterns);
|
|
96
96
|
const options = {
|
|
97
97
|
allowGenericParsing: fileNames.length < 15000,
|
|
98
98
|
allowSymbols: fileNames.length < 15000,
|
|
@@ -146,11 +146,11 @@ function restoreFileIndex(indexFileName) {
|
|
|
146
146
|
return new FileIndex(database);
|
|
147
147
|
}
|
|
148
148
|
exports.restoreFileIndex = restoreFileIndex;
|
|
149
|
-
async function buildFileIndex(directories, indexFileName) {
|
|
149
|
+
async function buildFileIndex(directories, indexFileName, excludePatterns) {
|
|
150
150
|
(0, assert_1.default)(!(0, fs_1.existsSync)(indexFileName), `Index file ${indexFileName} already exists`);
|
|
151
151
|
const database = new better_sqlite3_1.default(indexFileName);
|
|
152
152
|
const fileIndex = new FileIndex(database);
|
|
153
|
-
await fileIndex.indexDirectories(directories);
|
|
153
|
+
await fileIndex.indexDirectories(directories, excludePatterns);
|
|
154
154
|
console.log(`Wrote file index to ${indexFileName}`);
|
|
155
155
|
return fileIndex;
|
|
156
156
|
}
|
|
@@ -219,12 +219,14 @@ const BINARY_FILE_EXTENSIONS = [
|
|
|
219
219
|
'min.js',
|
|
220
220
|
'min.css',
|
|
221
221
|
].map((ext) => '.' + ext);
|
|
222
|
-
async function filterFiles(directory, fileNames) {
|
|
222
|
+
async function filterFiles(directory, fileNames, excludePatterns) {
|
|
223
223
|
const result = [];
|
|
224
224
|
for (const fileName of fileNames) {
|
|
225
225
|
const fileExtension = node_path_1.default.extname(fileName).toLowerCase();
|
|
226
226
|
if (BINARY_FILE_EXTENSIONS.some((ext) => ext === fileExtension))
|
|
227
227
|
continue;
|
|
228
|
+
if (excludePatterns === null || excludePatterns === void 0 ? void 0 : excludePatterns.some((pattern) => pattern.test(fileName)))
|
|
229
|
+
continue;
|
|
228
230
|
try {
|
|
229
231
|
const stats = await (0, promises_1.stat)((0, node_path_1.join)(directory, fileName));
|
|
230
232
|
if (stats.isFile() && stats.size < 50000)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileIndex.js","sourceRoot":"","sources":["../../src/fulltext/FileIndex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,uDAAuC;AAEvC,oEAAqC;AACrC,oDAA4B;AAC5B,2BAAgC;AAEhC,oCAAmC;AACnC,0EAAkD;AAClD,oEAA4C;AAC5C,4CAA6C;AAC7C,gFAAwD;AACxD,kEAA0C;AAa1C,MAAa,SAAS;IACpB,YAAmB,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;
|
|
1
|
+
{"version":3,"file":"FileIndex.js","sourceRoot":"","sources":["../../src/fulltext/FileIndex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,uDAAuC;AAEvC,oEAAqC;AACrC,oDAA4B;AAC5B,2BAAgC;AAEhC,oCAAmC;AACnC,0EAAkD;AAClD,oEAA4C;AAC5C,4CAA6C;AAC7C,gFAAwD;AACxD,kEAA0C;AAa1C,MAAa,SAAS;IACpB,YAAmB,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;QA+ErC,mBAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAChD,CACE,SAAiB,EACjB,SAAmB,EACnB,OAAwB,EACxB,MAAe,EACf,KAAc,EACd,EAAE;YACF,MAAM,UAAU,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;YAC3F,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;gBAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC9B,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;aAC9C;QACH,CAAC,CACF,CAAC;QAEF,oCAAsC;QA/FpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,uHAAuH,CACxH,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC1C,uBAAA,IAAI,qBAAW,IAAI,CAAC,QAAQ,CAAC,OAAO,CAClC,kEAAkE,CACnE,MAAA,CAAC;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,QAAkB,EAAE,KAAK,GAAG,EAAE;QACnC,MAAM,KAAK,GAAG,qGAAqG,CAAC;QAEpH,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAQ,EAAE,EAAE;YACxB,IAAI,IAAA,eAAO,GAAE;gBAAE,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;YAC7B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,WAAqB,EACrB,eAAqC,EACrC,SAAS,GAAG,GAAG;QAEf,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;YACnC,IAAI;gBACF,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,eAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC5C,MAAM,SAAS,GACb,QAAQ,KAAK,oBAAQ,CAAC,EAAE;oBACtB,CAAC,CAAC,MAAM,IAAA,6BAAmB,EAAC,SAAS,CAAC;oBACtC,CAAC,CAAC,MAAM,IAAA,0BAAgB,EAAC,SAAS,CAAC,CAAC;gBAExC,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;gBAEnF,MAAM,OAAO,GAAG;oBACd,mBAAmB,EAAE,SAAS,CAAC,MAAM,GAAG,KAAM;oBAC9C,YAAY,EAAE,SAAS,CAAC,MAAM,GAAG,KAAM;iBACxC,CAAC;gBAEF,IAAI,IAAA,eAAO,GAAE,EAAE;oBACb,IAAI,OAAO,CAAC,YAAY,EAAE;wBACxB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;wBAC1C,OAAO,CAAC,GAAG,CACT,6BAA6B,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CACtF,CAAC;qBACH;yBAAM;wBACL,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;qBAC5C;iBACF;gBAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;oBAC5D,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;oBAEzE,2CAA2C;oBAC3C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;iBACxD;gBAED,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,CACT,WAAW,SAAS,CAAC,MAAM,aAAa,SAAS,OAAO,OAAO,GAAG,SAAS,IAAI,CAChF,CAAC;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,8BAA8B,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;aAClE;SACF;IACH,CAAC;IAqBD,SAAS,CAAC,SAAiB,EAAE,QAAgB,EAAE,UAA0B,EAAE;QACzE,MAAM,EAAE,mBAAmB,GAAG,IAAI,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACpE,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,mBAAI,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI;YACF,IAAI,KAAK,GAAG,IAAA,uBAAa,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEpD,IAAI,YAAY,EAAE;gBAChB,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,mBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,mBAAmB,CAAC,CAAC;gBAClF,KAAK,IAAI,IAAI,IAAA,uBAAa,EAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;aACxD;YAED,IAAI,IAAA,eAAO,GAAE;gBAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,QAAQ,eAAe,KAAK,EAAE,CAAC,CAAC;YAEjF,uBAAA,IAAI,yBAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;SAC9C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC;CACF;AAvHD,8BAuHC;;AAED,SAAgB,gBAAgB,CAAC,aAAqB;IACpD,IAAA,gBAAM,EAAC,IAAA,eAAU,EAAC,aAAa,CAAC,EAAE,cAAc,aAAa,iBAAiB,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,IAAI,wBAAO,CAAC,aAAa,CAAC,CAAC;IAC5C,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAJD,4CAIC;AAEM,KAAK,UAAU,cAAc,CAClC,WAAqB,EACrB,aAAqB,EACrB,eAA0B;IAE1B,IAAA,gBAAM,EAAC,CAAC,IAAA,eAAU,EAAC,aAAa,CAAC,EAAE,cAAc,aAAa,iBAAiB,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,IAAI,wBAAO,CAAC,aAAa,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAC;IACpD,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,wCAWC;AAED,MAAM,sBAAsB,GAAa;IACvC,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,IAAI;IACJ,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;IACP,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,OAAO;IACP,IAAI;IACJ,KAAK;IACL,OAAO;IACP,GAAG;IACH,KAAK;IACL,QAAQ;IACR,SAAS;CACV,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;AAEnB,KAAK,UAAU,WAAW,CAC/B,SAAiB,EACjB,SAAmB,EACnB,eAA0B;IAE1B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3D,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,aAAa,CAAC;YAAE,SAAS;QAE1E,IAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAAE,SAAS;QAEzE,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,IAAA,eAAI,EAAC,IAAA,gBAAI,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;YACpD,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,GAAG,KAAM;gBAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClE;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,uBAAuB,QAAQ,EAAE,CAAC,CAAC;YAChD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,kCAqBC"}
|
|
@@ -131,7 +131,7 @@ class ContextCollector {
|
|
|
131
131
|
};
|
|
132
132
|
appmapSearchResponse = await AppMapIndex_1.default.search(this.appmapDirectories, query, searchOptions);
|
|
133
133
|
}
|
|
134
|
-
const fileSearchResponse = await (0, withIndex_1.default)('files', (indexFileName) => (0, FileIndex_1.buildFileIndex)(this.sourceDirectories, indexFileName), (index) => index.search(this.vectorTerms, search_1.DEFAULT_MAX_FILES));
|
|
134
|
+
const fileSearchResponse = await (0, withIndex_1.default)('files', (indexFileName) => (0, FileIndex_1.buildFileIndex)(this.sourceDirectories, indexFileName, this.excludePatterns), (index) => index.search(this.vectorTerms, search_1.DEFAULT_MAX_FILES));
|
|
135
135
|
const eventsCollector = new EventCollector(this.query, appmapSearchResponse);
|
|
136
136
|
const sourceCollector = new SourceCollector(this.vectorTerms, fileSearchResponse);
|
|
137
137
|
let contextCandidate;
|
|
@@ -172,10 +172,12 @@ class ContextCollector {
|
|
|
172
172
|
}
|
|
173
173
|
}
|
|
174
174
|
exports.ContextCollector = ContextCollector;
|
|
175
|
-
async function collectContext(appmapDirectories, sourceDirectories, appmaps, vectorTerms, charLimit) {
|
|
175
|
+
async function collectContext(appmapDirectories, sourceDirectories, appmaps, vectorTerms, charLimit, exclude) {
|
|
176
176
|
const contextCollector = new ContextCollector(appmapDirectories, sourceDirectories, vectorTerms, charLimit);
|
|
177
177
|
if (appmaps)
|
|
178
178
|
contextCollector.appmaps = appmaps;
|
|
179
|
+
if (exclude)
|
|
180
|
+
contextCollector.excludePatterns = exclude.map((pattern) => new RegExp(pattern));
|
|
179
181
|
return await contextCollector.collectContext();
|
|
180
182
|
}
|
|
181
183
|
exports.default = collectContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectContext.js","sourceRoot":"","sources":["../../../src/rpc/explain/collectContext.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"collectContext.js","sourceRoot":"","sources":["../../../src/rpc/explain/collectContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const lru_cache_1 = require("lru-cache");
|
|
|
22
22
|
const searchStatusByUserMessageId = new Map();
|
|
23
23
|
exports.DEFAULT_TOKEN_LIMIT = 12000;
|
|
24
24
|
class Explain extends events_1.default {
|
|
25
|
-
constructor(appmapDirectories, projectDirectories, question, codeSelection, appmaps, status, codeEditor) {
|
|
25
|
+
constructor(appmapDirectories, projectDirectories, question, codeSelection, appmaps, status, codeEditor, prompt) {
|
|
26
26
|
super();
|
|
27
27
|
this.appmapDirectories = appmapDirectories;
|
|
28
28
|
this.projectDirectories = projectDirectories;
|
|
@@ -31,6 +31,7 @@ class Explain extends events_1.default {
|
|
|
31
31
|
this.appmaps = appmaps;
|
|
32
32
|
this.status = status;
|
|
33
33
|
this.codeEditor = codeEditor;
|
|
34
|
+
this.prompt = prompt;
|
|
34
35
|
}
|
|
35
36
|
async explain(navie) {
|
|
36
37
|
navie.on('ack', (userMessageId, threadId) => {
|
|
@@ -72,7 +73,7 @@ class Explain extends events_1.default {
|
|
|
72
73
|
}
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
|
-
await navie.ask(this.status.threadId, this.question, this.codeSelection);
|
|
76
|
+
await navie.ask(this.status.threadId, this.question, this.codeSelection, this.prompt);
|
|
76
77
|
}
|
|
77
78
|
async searchContext(data) {
|
|
78
79
|
const { vectorTerms } = data;
|
|
@@ -106,7 +107,7 @@ class Explain extends events_1.default {
|
|
|
106
107
|
// pruned by the client AI anyway.
|
|
107
108
|
// The meaning of tokenCount is "try and get at least this many tokens"
|
|
108
109
|
const charLimit = tokenCount * 3;
|
|
109
|
-
const searchResult = await (0, collectContext_1.default)(this.appmapDirectories.map((dir) => dir.directory), this.projectDirectories, this.appmaps, keywords, charLimit);
|
|
110
|
+
const searchResult = await (0, collectContext_1.default)(this.appmapDirectories.map((dir) => dir.directory), this.projectDirectories, this.appmaps, keywords, charLimit, data.exclude);
|
|
110
111
|
this.status.searchResponse = searchResult.searchResponse;
|
|
111
112
|
this.status.contextResponse = searchResult.context;
|
|
112
113
|
this.status.step = rpc_1.ExplainRpc.Step.EXPLAIN;
|
|
@@ -155,7 +156,7 @@ const codeSelections = new lru_cache_1.LRUCache({
|
|
|
155
156
|
maxSize: 1024 ** 2 * 10 /* 10 MB */,
|
|
156
157
|
sizeCalculation: (value) => value.length,
|
|
157
158
|
});
|
|
158
|
-
async function explain(navieProvider, question, codeSelection, appmaps, threadId, codeEditor) {
|
|
159
|
+
async function explain(navieProvider, question, codeSelection, appmaps, threadId, codeEditor, prompt) {
|
|
159
160
|
const status = {
|
|
160
161
|
step: rpc_1.ExplainRpc.Step.NEW,
|
|
161
162
|
threadId,
|
|
@@ -167,7 +168,7 @@ async function explain(navieProvider, question, codeSelection, appmaps, threadId
|
|
|
167
168
|
if (!cachedCodeSelection && threadId) {
|
|
168
169
|
cachedCodeSelection = codeSelections.get(threadId);
|
|
169
170
|
}
|
|
170
|
-
const explain = new Explain(appmapDirectories, projectDirectories, question, cachedCodeSelection, appmaps, status, codeEditor);
|
|
171
|
+
const explain = new Explain(appmapDirectories, projectDirectories, question, cachedCodeSelection, appmaps, status, codeEditor, prompt);
|
|
171
172
|
const invokeContextFunction = async (data) => {
|
|
172
173
|
const type = data['type'];
|
|
173
174
|
const fnName = [type, 'Context'].join('');
|
|
@@ -223,7 +224,7 @@ async function explain(navieProvider, question, codeSelection, appmaps, threadId
|
|
|
223
224
|
const explainHandler = (navieProvider, codeEditor) => {
|
|
224
225
|
return {
|
|
225
226
|
name: rpc_1.ExplainRpc.ExplainFunctionName,
|
|
226
|
-
handler: async (options) => await explain(navieProvider, options.question, options.codeSelection, options.appmaps, options.threadId, codeEditor),
|
|
227
|
+
handler: async (options) => await explain(navieProvider, options.question, options.codeSelection, options.appmaps, options.threadId, codeEditor, options.prompt),
|
|
227
228
|
};
|
|
228
229
|
};
|
|
229
230
|
exports.explainHandler = explainHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../../../src/rpc/explain/explain.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAAkC;AAClC,qCAA+B;AAC/B,+BAAgC;AAChC,4CAMyB;AAEzB,sCAA0C;AAE1C,gCAA8C;AAC9C,sEAA8C;AAE9C,qEAAkE;AAClE,+EAA+D;AAC/D,iEAAgD;AAChD,0DAA0D;AAC1D,yEAAuD;AACvD,oFAA0D;AAC1D,yCAAqC;AAErC,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAA4C,CAAC;AAiB3E,QAAA,mBAAmB,GAAG,KAAK,CAAC;AAEzC,MAAa,OAAQ,SAAQ,gBAAY;IAGvC,YACS,iBAAoC,EACpC,kBAA4B,EAC5B,QAAgB,EAChB,aAAiC,EACjC,OAA6B,EAC7B,MAAwC,EACxC,
|
|
1
|
+
{"version":3,"file":"explain.js","sourceRoot":"","sources":["../../../src/rpc/explain/explain.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ class LocalNavie extends events_1.default {
|
|
|
104
104
|
throw new Error(`LocalNavie does not support option '${key}'`);
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
|
-
async ask(threadId, question, codeSelection) {
|
|
107
|
+
async ask(threadId, question, codeSelection, prompt) {
|
|
108
108
|
var _a, e_1, _b, _c;
|
|
109
109
|
var _d, _e, _f, _g;
|
|
110
110
|
if (!threadId) {
|
|
@@ -136,6 +136,7 @@ class LocalNavie extends events_1.default {
|
|
|
136
136
|
const clientRequest = {
|
|
137
137
|
question,
|
|
138
138
|
codeSelection,
|
|
139
|
+
prompt,
|
|
139
140
|
};
|
|
140
141
|
const messages = await history.restoreMessages();
|
|
141
142
|
await history.saveMessage({ content: question, role: 'user' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navie-local.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-local.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"navie-local.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-local.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,10 @@ class RemoteNavie extends events_1.default {
|
|
|
22
22
|
setOption(key, _value) {
|
|
23
23
|
throw new Error(`RemoteNavie does not support option '${key}'`);
|
|
24
24
|
}
|
|
25
|
-
async ask(threadId, question, codeSelection) {
|
|
25
|
+
async ask(threadId, question, codeSelection, prompt) {
|
|
26
|
+
if (prompt) {
|
|
27
|
+
(0, console_1.warn)(`RemoteNavie does not support a custom prompt option.`);
|
|
28
|
+
}
|
|
26
29
|
(await client_1.AI.connect({
|
|
27
30
|
onAck: (userMessageId, threadId) => {
|
|
28
31
|
if ((0, utils_1.verbose)())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navie-remote.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-remote.ts"],"names":[],"mappings":";;;;;AAAA,qCAA+B;AAC/B,oDAAkC;AAClC,4CAAqC;AACrC,0CAAyE;AAEzE,0CAAyC;AAEzC,oDAA4B;AAE5B,MAAqB,WAAY,SAAQ,gBAAY;IACnD,YACU,eAA0C,EAC1C,mBAAoD,EACpD,YAA+B;QAEvC,KAAK,EAAE,CAAC;QAJA,oBAAe,GAAf,eAAe,CAA2B;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAiC;QACpD,iBAAY,GAAZ,YAAY,CAAmB;IAGzC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,SAAS,CAAC,GAAW,EAAE,MAAuB;QAC5C,MAAM,IAAI,KAAK,CAAC,wCAAwC,GAAG,GAAG,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"navie-remote.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-remote.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.149.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"engines": {
|
|
@@ -133,7 +133,7 @@
|
|
|
133
133
|
"openapi-types": "^12.1.3",
|
|
134
134
|
"ora": "^5.4.1",
|
|
135
135
|
"parse-diff": "^0.11.1",
|
|
136
|
-
"pkg": "^5.8.
|
|
136
|
+
"pkg": "^5.8.1",
|
|
137
137
|
"port-pid": "^0.0.7",
|
|
138
138
|
"pretty-bytes": "^5.6.0",
|
|
139
139
|
"ps-node": "^0.1.6",
|