@appland/appmap 3.183.0 → 3.185.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 +15 -0
- package/built/cmds/index/index.js +2 -2
- package/built/cmds/index/index.js.map +1 -1
- package/built/cmds/navie.js +3 -3
- package/built/cmds/navie.js.map +1 -1
- package/built/rpc/explain/ContentRestrictions.js +163 -0
- package/built/rpc/explain/ContentRestrictions.js.map +1 -0
- package/built/rpc/explain/collect-location-context.js +17 -6
- package/built/rpc/explain/collect-location-context.js.map +1 -1
- package/built/rpc/explain/index/project-file-index.js +5 -0
- package/built/rpc/explain/index/project-file-index.js.map +1 -1
- package/built/rpc/explain/navie/historyWindows.js +73 -7
- package/built/rpc/explain/navie/historyWindows.js.map +1 -1
- package/built/rpc/explain/navie/navie-nop.js +27 -0
- package/built/rpc/explain/navie/navie-nop.js.map +1 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
# [@appland/appmap-v3.185.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.184.0...@appland/appmap-v3.185.0) (2025-02-05)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Add basic memory persistence to Windows ([e5402af](https://github.com/getappmap/appmap-js/commit/e5402af09e693de5e482df2b22133aba95b15b13))
|
|
7
|
+
* Support for file exclusion patterns in Navie ([2d1dcdf](https://github.com/getappmap/appmap-js/commit/2d1dcdf8caea5338be33da71ecb73900f0aa6882))
|
|
8
|
+
|
|
9
|
+
# [@appland/appmap-v3.184.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.183.0...@appland/appmap-v3.184.0) (2025-01-29)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* Add a nop replacement for remote Navie ([42b446e](https://github.com/getappmap/appmap-js/commit/42b446e4267c51d53bf17b004db5fbeb448d48e0))
|
|
15
|
+
|
|
1
16
|
# [@appland/appmap-v3.183.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.182.0...@appland/appmap-v3.183.0) (2025-01-24)
|
|
2
17
|
|
|
3
18
|
|
|
@@ -23,9 +23,9 @@ const rpcServer_1 = __importDefault(require("./rpcServer"));
|
|
|
23
23
|
const data_1 = __importDefault(require("../../rpc/appmap/data"));
|
|
24
24
|
const stats_1 = require("../../rpc/appmap/stats");
|
|
25
25
|
const navie_local_1 = __importDefault(require("../../rpc/explain/navie/navie-local"));
|
|
26
|
-
const navie_remote_1 = __importDefault(require("../../rpc/explain/navie/navie-remote"));
|
|
27
26
|
const update_1 = require("../../rpc/file/update");
|
|
28
27
|
const aiEnvVar_1 = require("./aiEnvVar");
|
|
28
|
+
const navie_nop_1 = __importDefault(require("../../rpc/explain/navie/navie-nop"));
|
|
29
29
|
exports.command = 'index';
|
|
30
30
|
exports.describe = 'Compute fingerprints and update index files for all appmaps in a directory';
|
|
31
31
|
const builder = (args) => {
|
|
@@ -108,7 +108,7 @@ const handler = async (argv) => {
|
|
|
108
108
|
navie.on('event', logEvent);
|
|
109
109
|
return navie;
|
|
110
110
|
};
|
|
111
|
-
const buildRemoteNavie = (
|
|
111
|
+
const buildRemoteNavie = () => new navie_nop_1.default();
|
|
112
112
|
const navieProvider = useLocalNavie() ? buildLocalNavie : buildRemoteNavie;
|
|
113
113
|
await (0, handleWorkingDirectory_1.configureRpcDirectories)([process.cwd()]);
|
|
114
114
|
const rpcMethods = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cmds/index/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAEhC,kDAA0B;AAC1B,4CAAoD;AAGpD,gHAAwF;AACxF,wGAAgF;AAChF,6EAAmG;AACnG,+DAA4D;AAC5D,uCAAsC;AACtC,qCAAoC;AACpC,+DAA4D;AAC5D,oDAAiD;AACjD,qEAAmD;AAEnD,yEAAiD;AACjD,uFAA+D;AAC/D,uDAAiF;AACjF,4DAAoC;AACpC,iEAA+C;AAC/C,kDAAsE;AACtE,sFAA6D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cmds/index/index.ts"],"names":[],"mappings":"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"}
|
package/built/cmds/navie.js
CHANGED
|
@@ -36,7 +36,6 @@ const client_1 = require("@appland/client");
|
|
|
36
36
|
const handleWorkingDirectory_1 = require("../lib/handleWorkingDirectory");
|
|
37
37
|
const explain_1 = require("../rpc/explain/explain");
|
|
38
38
|
const navie_local_1 = __importDefault(require("../rpc/explain/navie/navie-local"));
|
|
39
|
-
const navie_remote_1 = __importDefault(require("../rpc/explain/navie/navie-remote"));
|
|
40
39
|
const aiEnvVar_1 = __importStar(require("./index/aiEnvVar"));
|
|
41
40
|
const detectCodeEditor_1 = __importDefault(require("../lib/detectCodeEditor"));
|
|
42
41
|
const utils_1 = require("../utils");
|
|
@@ -44,6 +43,7 @@ const trajectory_1 = __importDefault(require("../rpc/explain/navie/trajectory"))
|
|
|
44
43
|
const serveAndOpen_1 = require("../lib/serveAndOpen");
|
|
45
44
|
const rpcServer_1 = __importDefault(require("./index/rpcServer"));
|
|
46
45
|
const rpc_1 = require("./index/rpc");
|
|
46
|
+
const navie_nop_1 = __importDefault(require("../rpc/explain/navie/navie-nop"));
|
|
47
47
|
function commonNavieArgsBuilder(args) {
|
|
48
48
|
return args
|
|
49
49
|
.option('verbose', {
|
|
@@ -167,9 +167,9 @@ function buildNavieProvider(argv) {
|
|
|
167
167
|
navie.on('event', logEvent);
|
|
168
168
|
return navie;
|
|
169
169
|
};
|
|
170
|
-
const buildRemoteNavie = (
|
|
170
|
+
const buildRemoteNavie = () => {
|
|
171
171
|
(0, client_1.loadConfiguration)(true);
|
|
172
|
-
const navie = new
|
|
172
|
+
const navie = new navie_nop_1.default();
|
|
173
173
|
applyAIOptions(navie);
|
|
174
174
|
if (argv.threadId) {
|
|
175
175
|
(0, node_console_1.warn)(`Ignoring --thread-id option for remote Navie provider`);
|
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;
|
|
1
|
+
{"version":3,"file":"navie.js","sourceRoot":"","sources":["../../src/cmds/navie.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
+
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
+
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
+
};
|
|
8
|
+
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
9
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
10
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
|
+
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
|
+
};
|
|
13
|
+
var _a, _ContentRestrictions_global, _ContentRestrictions_local, _ContentRestrictions_instance;
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const node_fs_1 = require("node:fs");
|
|
16
|
+
const node_os_1 = require("node:os");
|
|
17
|
+
const node_path_1 = require("node:path");
|
|
18
|
+
const minimatch_1 = require("minimatch");
|
|
19
|
+
class ContentRestrictions {
|
|
20
|
+
constructor() {
|
|
21
|
+
this.localRequired = false;
|
|
22
|
+
_ContentRestrictions_global.set(this, void 0);
|
|
23
|
+
_ContentRestrictions_local.set(this, new Map());
|
|
24
|
+
this.loadDefaults();
|
|
25
|
+
}
|
|
26
|
+
setGlobalRestrictions(restrictions) {
|
|
27
|
+
__classPrivateFieldSet(this, _ContentRestrictions_global, restrictions.map(makePattern), "f");
|
|
28
|
+
}
|
|
29
|
+
setLocalRestrictions(root, restrictions) {
|
|
30
|
+
__classPrivateFieldGet(this, _ContentRestrictions_local, "f").set(normalizeAbsolute(root), restrictions.map(makePattern));
|
|
31
|
+
}
|
|
32
|
+
safeRestricted(rootOrAbsolute, relative) {
|
|
33
|
+
try {
|
|
34
|
+
return this.isRestricted(rootOrAbsolute, relative);
|
|
35
|
+
}
|
|
36
|
+
catch (e) {
|
|
37
|
+
console.error(e);
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
isRestricted(rootOrAbsolute, relative) {
|
|
42
|
+
const normalized = normalizeAbsolute(rootOrAbsolute);
|
|
43
|
+
if (relative)
|
|
44
|
+
return this.isRestrictedImpl(normalized, relative);
|
|
45
|
+
else {
|
|
46
|
+
const root = [...__classPrivateFieldGet(this, _ContentRestrictions_local, "f").keys()].find((r) => normalized.startsWith(r));
|
|
47
|
+
if (root)
|
|
48
|
+
return this.isRestrictedImpl(root, normalized.slice(root.length + 1));
|
|
49
|
+
else if (this.localRequired)
|
|
50
|
+
throw new Error(`No local restrictions for path ${normalized}`);
|
|
51
|
+
else
|
|
52
|
+
return this.isRestrictedImpl('', normalized);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
isRestrictedImpl(root, path) {
|
|
56
|
+
let normalized = path.replaceAll('\\', '/');
|
|
57
|
+
if (normalized.startsWith('/'))
|
|
58
|
+
normalized = normalized.slice(1);
|
|
59
|
+
if (__classPrivateFieldGet(this, _ContentRestrictions_global, "f")) {
|
|
60
|
+
for (const matcher of __classPrivateFieldGet(this, _ContentRestrictions_global, "f")) {
|
|
61
|
+
if (matcher.match(normalized))
|
|
62
|
+
return true;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const localRestrictions = __classPrivateFieldGet(this, _ContentRestrictions_local, "f").get(root);
|
|
66
|
+
if (localRestrictions) {
|
|
67
|
+
for (const matcher of localRestrictions) {
|
|
68
|
+
if (matcher.match(normalized))
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
else if (this.localRequired)
|
|
73
|
+
throw new Error(`No local restrictions for root ${root}`);
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
reset() {
|
|
77
|
+
__classPrivateFieldSet(this, _ContentRestrictions_global, undefined, "f");
|
|
78
|
+
__classPrivateFieldGet(this, _ContentRestrictions_local, "f").clear();
|
|
79
|
+
}
|
|
80
|
+
loadDefaults() {
|
|
81
|
+
this.setGlobalRestrictions(getDefaultPatterns());
|
|
82
|
+
}
|
|
83
|
+
static get instance() {
|
|
84
|
+
if (!__classPrivateFieldGet(this, _a, "f", _ContentRestrictions_instance))
|
|
85
|
+
__classPrivateFieldSet(this, _a, new ContentRestrictions(), "f", _ContentRestrictions_instance);
|
|
86
|
+
return __classPrivateFieldGet(this, _a, "f", _ContentRestrictions_instance);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
exports.default = ContentRestrictions;
|
|
90
|
+
_a = ContentRestrictions, _ContentRestrictions_global = new WeakMap(), _ContentRestrictions_local = new WeakMap();
|
|
91
|
+
_ContentRestrictions_instance = { value: void 0 };
|
|
92
|
+
function makePattern(pattern) {
|
|
93
|
+
let pat = pattern;
|
|
94
|
+
// patterns starting with a slash are relative to the project root
|
|
95
|
+
if (pat.startsWith('/'))
|
|
96
|
+
pat = pat.slice(1);
|
|
97
|
+
// others can be anywhere
|
|
98
|
+
else
|
|
99
|
+
pat = '**/' + pat;
|
|
100
|
+
return new minimatch_1.Minimatch(pat, { dot: true, matchBase: true });
|
|
101
|
+
}
|
|
102
|
+
function normalizeAbsolute(path) {
|
|
103
|
+
let normalized = path;
|
|
104
|
+
// lower case the first character so windows drives are all lower case
|
|
105
|
+
if (normalized[0] >= 'A' && normalized[0] <= 'Z')
|
|
106
|
+
normalized = normalized[0].toLowerCase() + normalized.slice(1);
|
|
107
|
+
return normalized.replaceAll('\\', '/');
|
|
108
|
+
}
|
|
109
|
+
/*
|
|
110
|
+
* tries to read the global patterns from a
|
|
111
|
+
* config file or fall back to hardcoded list
|
|
112
|
+
*/
|
|
113
|
+
function getDefaultPatterns() {
|
|
114
|
+
// TODO: is there a better place to put this code?
|
|
115
|
+
const configPath = (0, node_path_1.join)((0, node_os_1.homedir)(), '.appmap', 'navie', 'global-ignore');
|
|
116
|
+
try {
|
|
117
|
+
return (0, node_fs_1.readFileSync)(configPath, 'utf-8')
|
|
118
|
+
.split('\n')
|
|
119
|
+
.map((s) => s.trim());
|
|
120
|
+
}
|
|
121
|
+
catch (e) {
|
|
122
|
+
console.warn(`Using default content restriction list, you can override it in ${configPath}`);
|
|
123
|
+
return DEFAULT_PATTERNS;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
const DEFAULT_PATTERNS = [
|
|
127
|
+
'config/**',
|
|
128
|
+
'db_config/**',
|
|
129
|
+
'db-scripts/**',
|
|
130
|
+
'backups/**',
|
|
131
|
+
'.vscode/**',
|
|
132
|
+
'config*.json',
|
|
133
|
+
'db_config*.json',
|
|
134
|
+
'application*.properties',
|
|
135
|
+
'web*.config',
|
|
136
|
+
'app*.config',
|
|
137
|
+
'*.pem',
|
|
138
|
+
'*.key',
|
|
139
|
+
'*.crt',
|
|
140
|
+
'*.log',
|
|
141
|
+
'config*.yaml',
|
|
142
|
+
'application*.yaml',
|
|
143
|
+
'application*.yml',
|
|
144
|
+
'config*.yml',
|
|
145
|
+
'database*.yml',
|
|
146
|
+
'config*.groovy',
|
|
147
|
+
'config*.py',
|
|
148
|
+
'config*.js',
|
|
149
|
+
'hibernate.cfg*.yml',
|
|
150
|
+
'pom.xml',
|
|
151
|
+
'settings*.js',
|
|
152
|
+
'settings*.py',
|
|
153
|
+
'*.ini',
|
|
154
|
+
'*.env',
|
|
155
|
+
'**/SWIFT/*.xml',
|
|
156
|
+
'*.csv',
|
|
157
|
+
'**/src/main/resources/*.properties',
|
|
158
|
+
'**/src/main/resources/*.yaml',
|
|
159
|
+
'**/src/main/resources/*.yml',
|
|
160
|
+
'**/src/main/resources/*.json',
|
|
161
|
+
'**/src/main/resources/*.xml',
|
|
162
|
+
];
|
|
163
|
+
//# sourceMappingURL=ContentRestrictions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ContentRestrictions.js","sourceRoot":"","sources":["../../../src/rpc/explain/ContentRestrictions.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,9 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
|
|
|
18
18
|
function reject(value) { resume("throw", value); }
|
|
19
19
|
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
20
20
|
};
|
|
21
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
+
};
|
|
21
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
25
|
const console_1 = require("console");
|
|
23
26
|
const promises_1 = require("node:fs/promises");
|
|
@@ -25,6 +28,7 @@ const node_path_1 = require("node:path");
|
|
|
25
28
|
const navie_1 = require("@appland/navie");
|
|
26
29
|
const search_1 = require("@appland/search");
|
|
27
30
|
const utils_1 = require("../../utils");
|
|
31
|
+
const ContentRestrictions_1 = __importDefault(require("./ContentRestrictions"));
|
|
28
32
|
/**
|
|
29
33
|
* Collect context information from specified locations
|
|
30
34
|
* within source directories. It reads the contents of files at these locations and extracts code snippets
|
|
@@ -68,12 +72,19 @@ async function collectLocationContext(sourceDirectories, locations, explicitFile
|
|
|
68
72
|
.map((loc) => loc.location.toString())
|
|
69
73
|
.join(', ')}`);
|
|
70
74
|
for (const { location, directory } of candidateLocations) {
|
|
71
|
-
|
|
72
|
-
if ((
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
const path = (0, node_path_1.join)(directory, location.path);
|
|
76
|
+
if (ContentRestrictions_1.default.instance.safeRestricted(directory, location.path)) {
|
|
77
|
+
if ((0, utils_1.verbose)())
|
|
78
|
+
(0, console_1.warn)(`[location-context] Skipping restricted location: ${path}`);
|
|
79
|
+
result.push({
|
|
80
|
+
type: navie_1.ContextV2.ContextItemType.CodeSnippet,
|
|
81
|
+
// TODO: tell the client out of band
|
|
82
|
+
content: '[file content access denied by security policy]',
|
|
83
|
+
location: location.toString(),
|
|
84
|
+
directory,
|
|
85
|
+
});
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
77
88
|
const stats = await (0, promises_1.stat)(path).catch(() => undefined);
|
|
78
89
|
if (!stats) {
|
|
79
90
|
if ((0, utils_1.verbose)())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-location-context.js","sourceRoot":"","sources":["../../../src/rpc/explain/collect-location-context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collect-location-context.js","sourceRoot":"","sources":["../../../src/rpc/explain/collect-location-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
9
9
|
const search_1 = require("@appland/search");
|
|
10
10
|
const filter_patterns_1 = require("./filter-patterns");
|
|
11
11
|
const build_index_in_temp_dir_1 = __importDefault(require("./build-index-in-temp-dir"));
|
|
12
|
+
const ContentRestrictions_1 = __importDefault(require("../ContentRestrictions"));
|
|
12
13
|
const debug = (0, debug_1.default)('appmap:index:project-files');
|
|
13
14
|
function fileFilter(includePatterns, excludePatterns) {
|
|
14
15
|
return async (path) => {
|
|
@@ -20,6 +21,10 @@ function fileFilter(includePatterns, excludePatterns) {
|
|
|
20
21
|
const includeFile = (0, filter_patterns_1.fileNameMatchesFilterPatterns)(path, includePatterns, excludePatterns);
|
|
21
22
|
if (!includeFile)
|
|
22
23
|
return false;
|
|
24
|
+
if (ContentRestrictions_1.default.instance.safeRestricted(path)) {
|
|
25
|
+
debug('Skipping restricted file: %s', path);
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
23
28
|
const isData = (0, search_1.isDataFile)(path);
|
|
24
29
|
if (isData && (await (0, search_1.isLargeFile)(path))) {
|
|
25
30
|
debug('Skipping large data file: %s', path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-file-index.js","sourceRoot":"","sources":["../../../../src/rpc/explain/index/project-file-index.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAqC;AACrC,kDAA8B;AAE9B,4CAYyB;AACzB,uDAAkE;AAElE,wFAAgF;AAEhF,MAAM,KAAK,GAAG,IAAA,eAAS,EAAC,4BAA4B,CAAC,CAAC;AAEtD,SAAS,UAAU,CACjB,eAAqC,EACrC,eAAqC;IAErC,OAAO,KAAK,EAAE,IAAY,EAAE,EAAE;QAC5B,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7B,IAAI,IAAA,qBAAY,EAAC,IAAI,CAAC,EAAE;YACtB,KAAK,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO,KAAK,CAAC;SACd;QAED,MAAM,WAAW,GAAG,IAAA,+CAA6B,EAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;QAC1F,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAE/B,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM,IAAI,CAAC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,EAAE;YACvC,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,EAAoB,EACpB,WAAqB,EACrB,eAAqC,EACrC,eAAqC;IAErC,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,EAAE,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,UAAU,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAC5D,MAAM,IAAA,uBAAc,EAAC,SAAS,EAAE,WAAW,EAAE,yBAAgB,EAAE,MAAM,EAAE,qBAAY,EAAE,mBAAU,CAAC,CAAC;IAEjG,OAAO,SAAS,CAAC;AACnB,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,iBAA2B,EAC3B,eAAqC,EACrC,eAAqC;IAErC,OAAO,MAAM,IAAA,iCAAmB,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QAC5D,MAAM,EAAE,GAAG,IAAI,wBAAO,CAAC,SAAS,CAAC,CAAC;QAClC,OAAO,MAAM,UAAU,CAAC,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACL,CAAC;AATD,sDASC;AAEM,KAAK,UAAU,kBAAkB,CACtC,SAAoB,EACpB,iBAA2B,EAC3B,eAAqC,EACrC,eAAqC,EACrC,WAAqB;IAErB,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IAC/F,IAAI;QACF,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;KAChE;YAAS;QACR,KAAK,CAAC,KAAK,EAAE,CAAC;KACf;AACH,CAAC;AAbD,gDAaC"}
|
|
1
|
+
{"version":3,"file":"project-file-index.js","sourceRoot":"","sources":["../../../../src/rpc/explain/index/project-file-index.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAqC;AACrC,kDAA8B;AAE9B,4CAYyB;AACzB,uDAAkE;AAElE,wFAAgF;AAEhF,iFAAyD;AAEzD,MAAM,KAAK,GAAG,IAAA,eAAS,EAAC,4BAA4B,CAAC,CAAC;AAEtD,SAAS,UAAU,CACjB,eAAqC,EACrC,eAAqC;IAErC,OAAO,KAAK,EAAE,IAAY,EAAE,EAAE;QAC5B,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7B,IAAI,IAAA,qBAAY,EAAC,IAAI,CAAC,EAAE;YACtB,KAAK,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO,KAAK,CAAC;SACd;QAED,MAAM,WAAW,GAAG,IAAA,+CAA6B,EAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;QAC1F,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAE/B,IAAI,6BAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YACrD,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;SACd;QAED,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM,IAAI,CAAC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,EAAE;YACvC,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,EAAoB,EACpB,WAAqB,EACrB,eAAqC,EACrC,eAAqC;IAErC,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,EAAE,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,UAAU,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAC5D,MAAM,IAAA,uBAAc,EAAC,SAAS,EAAE,WAAW,EAAE,yBAAgB,EAAE,MAAM,EAAE,qBAAY,EAAE,mBAAU,CAAC,CAAC;IAEjG,OAAO,SAAS,CAAC;AACnB,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,iBAA2B,EAC3B,eAAqC,EACrC,eAAqC;IAErC,OAAO,MAAM,IAAA,iCAAmB,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QAC5D,MAAM,EAAE,GAAG,IAAI,wBAAO,CAAC,SAAS,CAAC,CAAC;QAClC,OAAO,MAAM,UAAU,CAAC,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACL,CAAC;AATD,sDASC;AAEM,KAAK,UAAU,kBAAkB,CACtC,SAAoB,EACpB,iBAA2B,EAC3B,eAAqC,EACrC,eAAqC,EACrC,WAAqB;IAErB,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IAC/F,IAAI;QACF,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;KAChE;YAAS;QACR,KAAK,CAAC,KAAK,EAAE,CAAC;KACf;AACH,CAAC;AAbD,gDAaC"}
|
|
@@ -1,20 +1,86 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const ihistory_1 = require("./ihistory");
|
|
7
|
+
const thread_1 = __importDefault(require("./thread"));
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const promises_1 = require("fs/promises");
|
|
10
|
+
const configuration_1 = __importDefault(require("../../configuration"));
|
|
4
11
|
class HistoryWindows {
|
|
5
12
|
constructor(directory) {
|
|
6
13
|
this.directory = directory;
|
|
7
|
-
|
|
14
|
+
this.debounceTimers = new Map();
|
|
8
15
|
}
|
|
9
|
-
token() {
|
|
10
|
-
|
|
16
|
+
token(threadId, userMessageId, assistantMessageId, token) {
|
|
17
|
+
const thread = this.getOrCreateThread(threadId);
|
|
18
|
+
const exchange = thread.exchanges.find(({ question }) => question.messageId === userMessageId);
|
|
19
|
+
if (!exchange) {
|
|
20
|
+
throw new Error(`no exchange found for user message ${userMessageId}`);
|
|
21
|
+
}
|
|
22
|
+
if (!exchange.answer) {
|
|
23
|
+
exchange.answer = {
|
|
24
|
+
messageId: assistantMessageId,
|
|
25
|
+
role: 'assistant',
|
|
26
|
+
content: '',
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
exchange.answer.content += token;
|
|
30
|
+
this.writeThread(threadId);
|
|
11
31
|
}
|
|
12
|
-
question() {
|
|
13
|
-
|
|
32
|
+
question(threadId, userMessageId, question, codeSelection, prompt) {
|
|
33
|
+
const thread = this.getOrCreateThread(threadId);
|
|
34
|
+
const timestamp = new Date();
|
|
35
|
+
const serializedCodeSelection = codeSelection ? JSON.stringify(codeSelection) : undefined;
|
|
36
|
+
thread.question(timestamp.getTime(), userMessageId, question, serializedCodeSelection, prompt);
|
|
37
|
+
this.writeThread(threadId);
|
|
14
38
|
}
|
|
15
|
-
load(threadId) {
|
|
16
|
-
|
|
39
|
+
async load(threadId) {
|
|
40
|
+
let thread = HistoryWindows.THREADS.get(threadId);
|
|
41
|
+
if (!thread) {
|
|
42
|
+
const filePath = (0, path_1.join)(this.directory, `${threadId}.json`);
|
|
43
|
+
try {
|
|
44
|
+
const serialized = await (0, promises_1.readFile)(filePath, 'utf-8');
|
|
45
|
+
thread = thread_1.default.fromJSON(threadId, JSON.parse(serialized));
|
|
46
|
+
}
|
|
47
|
+
catch (e) {
|
|
48
|
+
throw new ihistory_1.ThreadAccessError(threadId, 'load', e instanceof Error ? e : new Error(String(e)));
|
|
49
|
+
}
|
|
50
|
+
HistoryWindows.THREADS.set(threadId, thread);
|
|
51
|
+
}
|
|
52
|
+
return thread;
|
|
53
|
+
}
|
|
54
|
+
getOrCreateThread(threadId) {
|
|
55
|
+
let thread = HistoryWindows.THREADS.get(threadId);
|
|
56
|
+
if (!thread) {
|
|
57
|
+
thread = new thread_1.default(threadId, Date.now(), (0, configuration_1.default)().projectDirectories);
|
|
58
|
+
HistoryWindows.THREADS.set(threadId, thread);
|
|
59
|
+
}
|
|
60
|
+
return thread;
|
|
61
|
+
}
|
|
62
|
+
writeThread(threadId) {
|
|
63
|
+
const timer = this.debounceTimers.get(threadId);
|
|
64
|
+
if (timer)
|
|
65
|
+
return;
|
|
66
|
+
this.debounceTimers.set(threadId, setTimeout(() => {
|
|
67
|
+
this.debounceTimers.delete(threadId);
|
|
68
|
+
const thread = HistoryWindows.THREADS.get(threadId);
|
|
69
|
+
if (!thread) {
|
|
70
|
+
console.warn(`tried to write thread ${threadId} to file, but it was not found`);
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const serialized = JSON.stringify(thread.asJSON());
|
|
74
|
+
const filePath = (0, path_1.join)(this.directory, `${thread.threadId}.json`);
|
|
75
|
+
(0, promises_1.mkdir)(this.directory, { recursive: true })
|
|
76
|
+
.then(() => (0, promises_1.writeFile)(filePath, serialized))
|
|
77
|
+
.catch((e) => {
|
|
78
|
+
console.warn(`failed to write thread ${thread.threadId} to file ${filePath}: ${e}`);
|
|
79
|
+
});
|
|
80
|
+
}, HistoryWindows.DEBOUNCE_TIME));
|
|
17
81
|
}
|
|
18
82
|
}
|
|
19
83
|
exports.default = HistoryWindows;
|
|
84
|
+
HistoryWindows.THREADS = new Map();
|
|
85
|
+
HistoryWindows.DEBOUNCE_TIME = 1000;
|
|
20
86
|
//# sourceMappingURL=historyWindows.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyWindows.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/historyWindows.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"historyWindows.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/historyWindows.ts"],"names":[],"mappings":";;;;;AACA,yCAA+C;AAE/C,sDAA8C;AAC9C,+BAA4B;AAC5B,0CAAyD;AACzD,wEAAgD;AAEhD,MAAqB,cAAc;IAKjC,YAA4B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAJrC,mBAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;IAIX,CAAC;IAEjD,KAAK,CAAC,QAAgB,EAAE,aAAqB,EAAE,kBAA0B,EAAE,KAAa;QACtF,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC;QAC/F,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,sCAAsC,aAAa,EAAE,CAAC,CAAC;SACxE;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,CAAC,MAAM,GAAG;gBAChB,SAAS,EAAE,kBAAkB;gBAC7B,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,EAAE;aACZ,CAAC;SACH;QACD,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ,CACN,QAAgB,EAChB,aAAqB,EACrB,QAAgB,EAChB,aAA8C,EAC9C,MAA0B;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,uBAAuB,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1F,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC;QAC/F,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAgB;QACzB,IAAI,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,GAAG,QAAQ,OAAO,CAAC,CAAC;YAC1D,IAAI;gBACF,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBACrD,MAAM,GAAG,gBAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAe,CAAC,CAAC;aAC1E;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,IAAI,4BAAiB,CACzB,QAAQ,EACR,MAAM,EACN,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC9C,CAAC;aACH;YACD,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC9C;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,iBAAiB,CAAC,QAAgB;QACxC,IAAI,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,gBAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAA,uBAAa,GAAE,CAAC,kBAAkB,CAAC,CAAC;YAC9E,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC9C;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,WAAW,CAAC,QAAgB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,KAAK;YAAE,OAAO;QAElB,IAAI,CAAC,cAAc,CAAC,GAAG,CACrB,QAAQ,EACR,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAErC,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,CAAC,IAAI,CAAC,yBAAyB,QAAQ,gCAAgC,CAAC,CAAC;gBAChF,OAAO;aACR;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,QAAQ,OAAO,CAAC,CAAC;YACjE,IAAA,gBAAK,EAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;iBACvC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,oBAAS,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;iBAC3C,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,OAAO,CAAC,IAAI,CAAC,0BAA0B,MAAM,CAAC,QAAQ,YAAY,QAAQ,KAAK,CAAC,EAAE,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;QACP,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CACjC,CAAC;IACJ,CAAC;;AA1FH,iCA2FC;AAzFgB,sBAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;AAC3B,4BAAa,GAAG,IAAI,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const events_1 = __importDefault(require("events"));
|
|
7
|
+
class NopNavie extends events_1.default {
|
|
8
|
+
constructor() {
|
|
9
|
+
super(...arguments);
|
|
10
|
+
this.providerName = 'nop';
|
|
11
|
+
}
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
13
|
+
setOption(key, _value) {
|
|
14
|
+
throw new Error(`NopNavie does not support option '${key}'`);
|
|
15
|
+
}
|
|
16
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
17
|
+
ask(_threadId, _question, _codeSelection, _prompt) {
|
|
18
|
+
this.emit('error', new Error(`AppMap is transitioning to a fully open-source model where you bring your own LLM, giving you complete control and ensuring your data stays with you.
|
|
19
|
+
|
|
20
|
+
With this change, the free hosted service is offline, but you can continue using Navie by configuring your own LLM provider.
|
|
21
|
+
|
|
22
|
+
For guidance on using other LLM providers such as OpenAI and Copilot, [check out our documentation](https://appmap.io/docs/using-navie-ai/bring-your-own-model.html).`));
|
|
23
|
+
return Promise.resolve();
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
exports.default = NopNavie;
|
|
27
|
+
//# sourceMappingURL=navie-nop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"navie-nop.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-nop.ts"],"names":[],"mappings":";;;;;AAAA,oDAAkC;AAGlC,MAAqB,QAAS,SAAQ,gBAAY;IAAlD;;QACkB,iBAAY,GAAG,KAAK,CAAC;IAmBvC,CAAC;IAjBC,6DAA6D;IAC7D,SAAS,CAAC,GAAW,EAAE,MAAuB;QAC5C,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,GAAG,CAAC,CAAC;IAC/D,CAAC;IAED,6DAA6D;IAC7D,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,cAAuB,EAAE,OAAgB;QACjF,IAAI,CAAC,IAAI,CACP,OAAO,EACP,IAAI,KAAK,CAAC;;;;sKAIsJ,CAAC,CAClK,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AApBD,2BAoBC"}
|