@appland/appmap 3.144.0 → 3.145.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 +14 -0
- package/built/cmds/navie/help.js +6 -1
- package/built/cmds/navie/help.js.map +1 -1
- package/built/cmds/navie.js +9 -4
- package/built/cmds/navie.js.map +1 -1
- package/built/rpc/explain/navie/navie-local.js +14 -14
- package/built/rpc/explain/navie/navie-local.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [@appland/appmap-v3.145.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.144.0...@appland/appmap-v3.145.0) (2024-05-20)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Detect code editor in the 'navie' command ([61a94ee](https://github.com/getappmap/appmap-js/commit/61a94ee3784486d483714564d140e805d29e21bc))
|
|
7
|
+
* Fix typos ([03990fd](https://github.com/getappmap/appmap-js/commit/03990fd11d5041784e739900f3bc8447711939af))
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* Add a URL to the beginning of each doc search result ([fde8d16](https://github.com/getappmap/appmap-js/commit/fde8d168af60e3dee6b08368eabc3f15ec398d18))
|
|
13
|
+
* Introduce Navie commands, including [@classify](https://github.com/classify) ([e76a3fc](https://github.com/getappmap/appmap-js/commit/e76a3fcaa825a1fe0bd8e0db5042e2ee38989a84))
|
|
14
|
+
|
|
1
15
|
# [@appland/appmap-v3.144.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.143.0...@appland/appmap-v3.144.0) (2024-05-19)
|
|
2
16
|
|
|
3
17
|
|
package/built/cmds/navie/help.js
CHANGED
|
@@ -36,12 +36,17 @@ class HelpIndex {
|
|
|
36
36
|
return this.idx
|
|
37
37
|
.search(keywords.join(' '))
|
|
38
38
|
.map((result) => {
|
|
39
|
-
|
|
39
|
+
let content = this.contentByRef.get(result.ref);
|
|
40
40
|
const [filePath, from, to] = unpackRef(result.ref);
|
|
41
41
|
if (!content) {
|
|
42
42
|
(0, console_1.warn)(`Could not find content for ${result.ref}`);
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
|
+
const filePathWithoutMdSuffix = filePath.replace(/\.md$/, '');
|
|
46
|
+
content = [
|
|
47
|
+
`<!-- Permalink: https://appmap.io/docs/${filePathWithoutMdSuffix} -->`,
|
|
48
|
+
content,
|
|
49
|
+
].join('\n');
|
|
45
50
|
return {
|
|
46
51
|
filePath,
|
|
47
52
|
from,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cmds/navie/help.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uCAAuE;AACvE,qCAAoC;AACpC,0CAAuC;AACvC,2DAA+D;AAC/D,+BAA4B;AAC5B,2BAAgC;AAChC,oDAA4B;AAC5B,qCAA+B;AAE/B,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAE,qBAAqB,CAAC;KACnD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;KAClC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,GAAG,CAAC,CAAC,CAAC;AAErB,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAEtC,SAAgB,OAAO,CAAC,QAAgB,EAAE,IAAY,EAAE,EAAU;IAChE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC;AAFD,0BAEC;AAED,SAAgB,SAAS,CAAC,GAAW;IACnC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AAClD,CAAC;AAHD,8BAGC;AAOD,MAAa,SAAS;IACpB,YACU,GAAe,EACf,kBAA4C,EAC5C,YAAiC;QAFjC,QAAG,GAAH,GAAG,CAAY;QACf,uBAAkB,GAAlB,kBAAkB,CAA0B;QAC5C,iBAAY,GAAZ,YAAY,CAAqB;IACxC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,QAAkB,EAAE,UAAU,GAAG,2BAAmB;QAC/D,OACE,IAAI,CAAC,GAAG;aACL,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC1B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACd,
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cmds/navie/help.ts"],"names":[],"mappings":"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"}
|
package/built/cmds/navie.js
CHANGED
|
@@ -33,12 +33,12 @@ const promises_1 = require("node:fs/promises");
|
|
|
33
33
|
const consumers_1 = require("node:stream/consumers");
|
|
34
34
|
const chalk_1 = __importDefault(require("chalk"));
|
|
35
35
|
const client_1 = require("@appland/client");
|
|
36
|
-
const navie_1 = require("@appland/navie");
|
|
37
36
|
const handleWorkingDirectory_1 = require("../lib/handleWorkingDirectory");
|
|
38
37
|
const explain_1 = require("../rpc/explain/explain");
|
|
39
38
|
const navie_local_1 = __importDefault(require("../rpc/explain/navie/navie-local"));
|
|
40
39
|
const navie_remote_1 = __importDefault(require("../rpc/explain/navie/navie-remote"));
|
|
41
40
|
const aiEnvVar_1 = __importStar(require("./index/aiEnvVar"));
|
|
41
|
+
const detectCodeEditor_1 = __importDefault(require("../lib/detectCodeEditor"));
|
|
42
42
|
function commonNavieArgsBuilder(args) {
|
|
43
43
|
return args
|
|
44
44
|
.option('directory', {
|
|
@@ -65,8 +65,7 @@ function commonNavieArgsBuilder(args) {
|
|
|
65
65
|
array: true,
|
|
66
66
|
})
|
|
67
67
|
.option('agent-mode', {
|
|
68
|
-
describe: `
|
|
69
|
-
choices: Object.values(navie_1.Agents).map((agent) => agent.toLowerCase()),
|
|
68
|
+
describe: `This option is deprecated. Instead, start your question with @<command | agent>.`,
|
|
70
69
|
})
|
|
71
70
|
.option('code-editor', {
|
|
72
71
|
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.',
|
|
@@ -175,9 +174,15 @@ async function handler(argv) {
|
|
|
175
174
|
})
|
|
176
175
|
.on('token', (token) => output.write(token));
|
|
177
176
|
}
|
|
177
|
+
let codeEditor = argv.codeEditor;
|
|
178
|
+
if (!codeEditor) {
|
|
179
|
+
codeEditor = (0, detectCodeEditor_1.default)();
|
|
180
|
+
if (codeEditor)
|
|
181
|
+
(0, node_console_1.warn)(`Detected code editor: ${codeEditor}`);
|
|
182
|
+
}
|
|
178
183
|
const question = await getQuestion(argv.input, argv.question);
|
|
179
184
|
const capturingProvider = (...args) => attachNavie(buildNavieProvider(argv)(...args));
|
|
180
|
-
await (0, explain_1.explainHandler)(capturingProvider,
|
|
185
|
+
await (0, explain_1.explainHandler)(capturingProvider, codeEditor).handler({ question });
|
|
181
186
|
}
|
|
182
187
|
exports.handler = handler;
|
|
183
188
|
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;
|
|
1
|
+
{"version":3,"file":"navie.js","sourceRoot":"","sources":["../../src/cmds/navie.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,17 +66,17 @@ class LocalHistory {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
const OPTION_SETTERS = {
|
|
69
|
-
tokenLimit: (
|
|
70
|
-
|
|
69
|
+
tokenLimit: (navieOptions, value) => {
|
|
70
|
+
navieOptions.tokenLimit = typeof value === 'string' ? parseInt(value, 10) : value;
|
|
71
71
|
},
|
|
72
|
-
temperature: (
|
|
73
|
-
|
|
72
|
+
temperature: (navieOptions, value) => {
|
|
73
|
+
navieOptions.temperature = typeof value === 'string' ? parseFloat(value) : value;
|
|
74
74
|
},
|
|
75
|
-
modelName: (
|
|
76
|
-
|
|
75
|
+
modelName: (navieOptions, value) => {
|
|
76
|
+
navieOptions.modelName = String(value);
|
|
77
77
|
},
|
|
78
|
-
explainMode: (
|
|
79
|
-
|
|
78
|
+
explainMode: () => {
|
|
79
|
+
(0, console_1.warn)(`Option 'explainMode' is deprecated and will be ignored`);
|
|
80
80
|
},
|
|
81
81
|
};
|
|
82
82
|
class LocalNavie extends events_1.default {
|
|
@@ -87,7 +87,7 @@ class LocalNavie extends events_1.default {
|
|
|
87
87
|
this.projectInfoProvider = projectInfoProvider;
|
|
88
88
|
this.helpProvider = helpProvider;
|
|
89
89
|
_LocalNavie_instances.add(this);
|
|
90
|
-
this.
|
|
90
|
+
this.navieOptions = new navie_1.Navie.NavieOptions();
|
|
91
91
|
_LocalNavie_skipTelemetry.set(this, !telemetry_1.default.enabled);
|
|
92
92
|
if (threadId) {
|
|
93
93
|
(0, console_1.log)(`[local-navie] Continuing thread ${threadId}`);
|
|
@@ -103,7 +103,7 @@ class LocalNavie extends events_1.default {
|
|
|
103
103
|
setOption(key, value) {
|
|
104
104
|
const setter = OPTION_SETTERS[key];
|
|
105
105
|
if (setter) {
|
|
106
|
-
setter(this.
|
|
106
|
+
setter(this.navieOptions, value);
|
|
107
107
|
}
|
|
108
108
|
else {
|
|
109
109
|
throw new Error(`LocalNavie does not support option '${key}'`);
|
|
@@ -121,11 +121,11 @@ class LocalNavie extends events_1.default {
|
|
|
121
121
|
};
|
|
122
122
|
const history = await this.history.restoreMessages();
|
|
123
123
|
this.history.saveMessage({ content: question, role: 'user' });
|
|
124
|
-
const
|
|
125
|
-
|
|
124
|
+
const navieFn = (0, navie_1.navie)(clientRequest, this.contextProvider, this.projectInfoProvider, this.helpProvider, this.navieOptions, history);
|
|
125
|
+
navieFn.on('event', (event) => this.emit('event', event));
|
|
126
126
|
const response = new Array();
|
|
127
127
|
try {
|
|
128
|
-
for (var _d = true, _e = __asyncValues(
|
|
128
|
+
for (var _d = true, _e = __asyncValues(navieFn.execute()), _f; _f = await _e.next(), _a = _f.done, !_a;) {
|
|
129
129
|
_c = _f.value;
|
|
130
130
|
_d = false;
|
|
131
131
|
try {
|
|
@@ -156,7 +156,7 @@ _LocalNavie_skipTelemetry = new WeakMap(), _LocalNavie_instances = new WeakSet()
|
|
|
156
156
|
telemetry_1.default.sendEvent({
|
|
157
157
|
name: 'navie-local',
|
|
158
158
|
properties: {
|
|
159
|
-
modelName: this.
|
|
159
|
+
modelName: this.navieOptions.modelName,
|
|
160
160
|
azureVersion: process.env.AZURE_OPENAI_API_VERSION,
|
|
161
161
|
},
|
|
162
162
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navie-local.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"navie-local.js","sourceRoot":"","sources":["../../../../src/rpc/explain/navie/navie-local.ts"],"names":[],"mappings":"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"}
|