@evref-bl/pharo-launcher-mcp 0.1.3 → 0.2.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/README.md +30 -38
- package/dist/commandCatalog.d.ts +0 -2
- package/dist/commandCatalog.d.ts.map +1 -1
- package/dist/commandCatalog.js +18 -279
- package/dist/commandCatalog.js.map +1 -1
- package/dist/crossProfileCopy.d.ts +1 -0
- package/dist/crossProfileCopy.d.ts.map +1 -1
- package/dist/crossProfileCopy.js +107 -14
- package/dist/crossProfileCopy.js.map +1 -1
- package/dist/discovery.d.ts +0 -151
- package/dist/discovery.d.ts.map +1 -1
- package/dist/discovery.js +31 -702
- package/dist/discovery.js.map +1 -1
- package/dist/launcherCli.d.ts.map +1 -1
- package/dist/launcherCli.js +94 -103
- package/dist/launcherCli.js.map +1 -1
- package/dist/launcherScript.d.ts +0 -1
- package/dist/launcherScript.d.ts.map +1 -1
- package/dist/launcherScript.js.map +1 -1
- package/dist/models.d.ts +1 -9
- package/dist/models.d.ts.map +1 -1
- package/dist/parser.d.ts +1 -3
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +58 -53
- package/dist/parser.js.map +1 -1
- package/dist/processTools.d.ts.map +1 -1
- package/dist/processTools.js +25 -11
- package/dist/processTools.js.map +1 -1
- package/dist/resultNormalizer.d.ts +5 -1
- package/dist/resultNormalizer.d.ts.map +1 -1
- package/dist/resultNormalizer.js +36 -21
- package/dist/resultNormalizer.js.map +1 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +111 -243
- package/dist/server.js.map +1 -1
- package/dist/textTokens.d.ts +10 -0
- package/dist/textTokens.d.ts.map +1 -0
- package/dist/textTokens.js +68 -0
- package/dist/textTokens.js.map +1 -0
- package/docs/README.md +1 -1
- package/docs/cleanup-hook-boundary.md +5 -8
- package/docs/development.md +7 -1
- package/docs/reference/tools.md +33 -76
- package/docs/troubleshooting.md +11 -18
- package/docs/user/getting-started.md +8 -16
- package/docs/user/profile-mode.md +12 -8
- package/package.json +12 -4
package/dist/parser.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { LauncherImage, LauncherOutputFormat, LauncherProcess, LauncherTemplate
|
|
1
|
+
import type { LauncherImage, LauncherOutputFormat, LauncherProcess, LauncherTemplate } from "./models.js";
|
|
2
2
|
export interface ParseResult<T = unknown> {
|
|
3
3
|
status: "parsed" | "unsupported" | "failed";
|
|
4
4
|
format: LauncherOutputFormat;
|
|
@@ -11,8 +11,6 @@ export declare function parseLauncherTemplatesFromSton(source: string): Launcher
|
|
|
11
11
|
export declare function parseLauncherTemplatesFromText(source: string): LauncherTemplate[];
|
|
12
12
|
export declare function parseTemplateCategoriesFromSton(source: string): string[];
|
|
13
13
|
export declare function parseTemplateCategoriesFromText(source: string): string[];
|
|
14
|
-
export declare function parseLauncherVmsFromSton(source: string): LauncherVm[];
|
|
15
|
-
export declare function parseLauncherVmsFromText(source: string): LauncherVm[];
|
|
16
14
|
export declare function parseLauncherProcessesFromText(source: string): LauncherProcess[];
|
|
17
15
|
export declare function parseLauncherOutput(toolName: string, format: LauncherOutputFormat, stdout: string): ParseResult;
|
|
18
16
|
//# sourceMappingURL=parser.d.ts.map
|
package/dist/parser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,gBAAgB,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAWrB,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,OAAO;IACtC,MAAM,EAAE,QAAQ,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC5C,MAAM,EAAE,oBAAoB,CAAC;IAC7B,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA4GD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAsB3E;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAwB3E;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAWjF;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAOjF;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAExE;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAOxE;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,EAAE,CAsChF;AAyBD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,MAAM,GACb,WAAW,CA0Cb"}
|
package/dist/parser.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
+
import { hasCaseInsensitiveSuffix, isWhitespace, leadingDigits, quotedValues, stripLeadingNumber, whitespaceTokens, } from "./textTokens.js";
|
|
2
3
|
function stonBlocks(source, className) {
|
|
3
4
|
const blocks = [];
|
|
4
5
|
let index = 0;
|
|
@@ -46,21 +47,51 @@ function relativePath(block) {
|
|
|
46
47
|
const parts = [...match[1].matchAll(/'([^']*)'/g)].map((part) => part[1]);
|
|
47
48
|
return parts.join("/");
|
|
48
49
|
}
|
|
50
|
+
function splitFixedColumns(value) {
|
|
51
|
+
const columns = [];
|
|
52
|
+
let columnStart = 0;
|
|
53
|
+
let index = 0;
|
|
54
|
+
while (index < value.length) {
|
|
55
|
+
if (!isWhitespace(value[index])) {
|
|
56
|
+
index += 1;
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
const whitespaceStart = index;
|
|
60
|
+
while (isWhitespace(value[index])) {
|
|
61
|
+
index += 1;
|
|
62
|
+
}
|
|
63
|
+
if (index - whitespaceStart >= 2) {
|
|
64
|
+
columns.push(value.slice(columnStart, whitespaceStart).trim());
|
|
65
|
+
columnStart = index;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
columns.push(value.slice(columnStart).trim());
|
|
69
|
+
return columns.filter((column) => column.length > 0);
|
|
70
|
+
}
|
|
71
|
+
function withoutBoundaryQuotes(value) {
|
|
72
|
+
if (!value) {
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
return value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1) : value;
|
|
76
|
+
}
|
|
49
77
|
function basenameWithoutImageExtension(imagePath) {
|
|
50
78
|
const basename = imagePath.split(/[\\/]/).at(-1) ?? imagePath;
|
|
51
79
|
return basename.replace(/\.image$/i, "");
|
|
52
80
|
}
|
|
81
|
+
// PharoLauncher keeps an image at <Name>/<Name>.image, so the directory the
|
|
82
|
+
// image file sits in is the image's name — the same rule the metadata repair
|
|
83
|
+
// reads. Metadata that stores only the file name has no directory to read, so
|
|
84
|
+
// take the name off the file instead.
|
|
85
|
+
function imageNameFromRelativePath(imagePath) {
|
|
86
|
+
const parts = imagePath.split(/[\\/]/);
|
|
87
|
+
const parent = parts.at(-2);
|
|
88
|
+
return parent ?? basenameWithoutImageExtension(imagePath);
|
|
89
|
+
}
|
|
53
90
|
export function parseLauncherImagesFromSton(source) {
|
|
54
91
|
return stonBlocks(source, "PhLImage").map((block) => {
|
|
55
92
|
const imagePath = relativePath(block);
|
|
56
93
|
return {
|
|
57
|
-
...(imagePath
|
|
58
|
-
? {
|
|
59
|
-
name: imagePath.split(/[\\/]/)[0] ??
|
|
60
|
-
basenameWithoutImageExtension(imagePath),
|
|
61
|
-
imagePath,
|
|
62
|
-
}
|
|
63
|
-
: {}),
|
|
94
|
+
...(imagePath ? { name: imageNameFromRelativePath(imagePath), imagePath } : {}),
|
|
64
95
|
...(field(block, "architecture")
|
|
65
96
|
? { architecture: field(block, "architecture") }
|
|
66
97
|
: {}),
|
|
@@ -82,16 +113,22 @@ export function parseLauncherImagesFromText(source) {
|
|
|
82
113
|
return source
|
|
83
114
|
.split(/\r?\n/)
|
|
84
115
|
.map((line) => line.trimEnd())
|
|
85
|
-
.filter((line) =>
|
|
116
|
+
.filter((line) => {
|
|
117
|
+
const digits = leadingDigits(line);
|
|
118
|
+
return Boolean(digits && isWhitespace(line[digits.length]));
|
|
119
|
+
})
|
|
86
120
|
.map((line) => {
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
|
|
121
|
+
const columns = splitFixedColumns(line);
|
|
122
|
+
const dataColumns = columns[0] !== undefined && leadingDigits(columns[0]) === columns[0]
|
|
123
|
+
? columns.slice(1)
|
|
124
|
+
: columns;
|
|
125
|
+
if (dataColumns.length < 3) {
|
|
126
|
+
return { name: stripLeadingNumber(line).trim() };
|
|
90
127
|
}
|
|
91
128
|
return {
|
|
92
|
-
name:
|
|
93
|
-
architecture:
|
|
94
|
-
pharoVersion:
|
|
129
|
+
name: stripLeadingNumber(dataColumns[0]).trim(),
|
|
130
|
+
architecture: dataColumns[1],
|
|
131
|
+
pharoVersion: whitespaceTokens(dataColumns[2])[0] ?? dataColumns[2],
|
|
95
132
|
};
|
|
96
133
|
});
|
|
97
134
|
}
|
|
@@ -125,42 +162,22 @@ export function parseTemplateCategoriesFromText(source) {
|
|
|
125
162
|
.filter((line) => !line.startsWith("#") && !line.startsWith("--"))
|
|
126
163
|
.map((line) => line.replace(/^\d+\s+/, ""));
|
|
127
164
|
}
|
|
128
|
-
export function parseLauncherVmsFromSton(source) {
|
|
129
|
-
return stonBlocks(source, "PhLVirtualMachine").map((block) => ({
|
|
130
|
-
...(field(block, "id") ? { id: field(block, "id") } : {}),
|
|
131
|
-
...(field(block, "name") ? { name: field(block, "name") } : {}),
|
|
132
|
-
...(field(block, "arch") ? { architecture: field(block, "arch") } : {}),
|
|
133
|
-
...(relativePath(block) ? { executablePath: relativePath(block) } : {}),
|
|
134
|
-
...(field(block, "status") ? { status: field(block, "status") } : {}),
|
|
135
|
-
...(field(block, "blessing") ? { blessing: field(block, "blessing") } : {}),
|
|
136
|
-
}));
|
|
137
|
-
}
|
|
138
|
-
export function parseLauncherVmsFromText(source) {
|
|
139
|
-
return source
|
|
140
|
-
.split(/\r?\n/)
|
|
141
|
-
.map((line) => line.trim())
|
|
142
|
-
.filter(Boolean)
|
|
143
|
-
.filter((line) => !line.startsWith("#") && !line.startsWith("--"))
|
|
144
|
-
.map((line) => {
|
|
145
|
-
const id = line.split(/\s+/)[0];
|
|
146
|
-
return { id, status: line };
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
165
|
export function parseLauncherProcessesFromText(source) {
|
|
150
166
|
return source
|
|
151
167
|
.split(/\r?\n/)
|
|
152
168
|
.map((line) => line.trim())
|
|
153
169
|
.filter(Boolean)
|
|
154
170
|
.map((line) => {
|
|
155
|
-
const pidText = line
|
|
171
|
+
const pidText = leadingDigits(line);
|
|
156
172
|
if (!pidText) {
|
|
157
173
|
return undefined;
|
|
158
174
|
}
|
|
159
|
-
const
|
|
160
|
-
const
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
175
|
+
const values = quotedValues(line);
|
|
176
|
+
const commandText = stripLeadingNumber(line);
|
|
177
|
+
const imagePath = values.find((value) => hasCaseInsensitiveSuffix(value, ".image")) ??
|
|
178
|
+
whitespaceTokens(commandText).find((value) => hasCaseInsensitiveSuffix(value, ".image"));
|
|
179
|
+
const executablePath = values.find((value) => hasCaseInsensitiveSuffix(value, ".exe") ||
|
|
180
|
+
hasCaseInsensitiveSuffix(value, ".app")) ?? withoutBoundaryQuotes(whitespaceTokens(commandText)[0]);
|
|
164
181
|
return {
|
|
165
182
|
pid: Number(pidText),
|
|
166
183
|
commandLine: line,
|
|
@@ -212,18 +229,6 @@ export function parseLauncherOutput(toolName, format, stdout) {
|
|
|
212
229
|
return parseWithStatus(format, () => format === "ston"
|
|
213
230
|
? parseLauncherTemplatesFromSton(stdout)
|
|
214
231
|
: parseLauncherTemplatesFromText(stdout));
|
|
215
|
-
case "pharo_launcher_template_info":
|
|
216
|
-
return parseWithStatus(format, () => singleOrArray(format === "ston"
|
|
217
|
-
? parseLauncherTemplatesFromSton(stdout)
|
|
218
|
-
: parseLauncherTemplatesFromText(stdout)));
|
|
219
|
-
case "pharo_launcher_vm_list":
|
|
220
|
-
return parseWithStatus(format, () => format === "ston"
|
|
221
|
-
? parseLauncherVmsFromSton(stdout)
|
|
222
|
-
: parseLauncherVmsFromText(stdout));
|
|
223
|
-
case "pharo_launcher_vm_info":
|
|
224
|
-
return parseWithStatus(format, () => singleOrArray(format === "ston"
|
|
225
|
-
? parseLauncherVmsFromSton(stdout)
|
|
226
|
-
: parseLauncherVmsFromText(stdout)));
|
|
227
232
|
case "pharo_launcher_process_list":
|
|
228
233
|
return parseWithStatus("text", () => parseLauncherProcessesFromText(stdout));
|
|
229
234
|
default:
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processTools.d.ts","sourceRoot":"","sources":["../src/processTools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"processTools.d.ts","sourceRoot":"","sources":["../src/processTools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAS1D,KAAK,gBAAgB,GAAG,oBAAoB,GAAG,UAAU,GAAG,aAAa,CAAC;AAQ1E,UAAU,kBAAkB;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,0BAA0B,GAAG,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB,MAAM,WAAW,2BAA2B;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,UAAU,CAAC,EAAE,0BAA0B,CAAC;IACxC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAiJD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,EAAE,CA4B3E;AA4BD,wBAAgB,2BAA2B,CACzC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,2BAA2B,CAuB7B;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,OAAO,CAET;AAkBD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,kBAAkB,GAAE,MAAM,GAAG,2BAAoC,GAChE,OAAO,CAAC,iBAAiB,CAAC,CA0F5B"}
|
package/dist/processTools.js
CHANGED
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { afterLeadingDigits, hasCaseInsensitiveSuffix, leadingDigits, quotedValues, whitespaceTokens, } from "./textTokens.js";
|
|
3
4
|
function duration(startTime) {
|
|
4
5
|
return Date.now() - startTime;
|
|
5
6
|
}
|
|
6
7
|
function basenameWithoutImageExtension(imagePath) {
|
|
7
8
|
return path.basename(imagePath).replace(/\.image$/i, "");
|
|
8
9
|
}
|
|
10
|
+
function mentionsPharoRuntime(commandLine) {
|
|
11
|
+
const lower = commandLine.toLowerCase();
|
|
12
|
+
return lower.includes("pharo") || lower.includes("squeak");
|
|
13
|
+
}
|
|
9
14
|
function imagePathFromCommandLine(commandLine) {
|
|
10
|
-
const quoted =
|
|
11
|
-
return quoted
|
|
15
|
+
const quoted = quotedValues(commandLine).find((value) => hasCaseInsensitiveSuffix(value, ".image"));
|
|
16
|
+
return (quoted ??
|
|
17
|
+
whitespaceTokens(commandLine).find((value) => hasCaseInsensitiveSuffix(value, ".image")));
|
|
12
18
|
}
|
|
13
19
|
function processLine(process) {
|
|
14
20
|
return [
|
|
@@ -107,14 +113,14 @@ export function parsePosixProcessTable(source) {
|
|
|
107
113
|
.map((line) => line.trim())
|
|
108
114
|
.filter(Boolean)
|
|
109
115
|
.map((line) => {
|
|
110
|
-
const
|
|
111
|
-
|
|
116
|
+
const pidText = leadingDigits(line);
|
|
117
|
+
const commandLine = afterLeadingDigits(line);
|
|
118
|
+
if (!pidText || !commandLine) {
|
|
112
119
|
return undefined;
|
|
113
120
|
}
|
|
114
|
-
const pid = Number(
|
|
115
|
-
const commandLine = match[2] ?? "";
|
|
121
|
+
const pid = Number(pidText);
|
|
116
122
|
const imagePath = imagePathFromCommandLine(commandLine);
|
|
117
|
-
if (!pid || !imagePath ||
|
|
123
|
+
if (!pid || !imagePath || !mentionsPharoRuntime(commandLine)) {
|
|
118
124
|
return undefined;
|
|
119
125
|
}
|
|
120
126
|
const executablePath = executablePathFromCommandLine(commandLine);
|
|
@@ -132,11 +138,19 @@ async function listPosixPharoProcesses(timeoutMs, runCommand) {
|
|
|
132
138
|
const stdout = await runCommand("ps", ["-axo", "pid=,args="], timeoutMs);
|
|
133
139
|
return parsePosixProcessTable(stdout);
|
|
134
140
|
}
|
|
141
|
+
// A pid names one process, so match one process. The caller spells its target
|
|
142
|
+
// as a pid or an image name and the Launcher CLI takes one positional either
|
|
143
|
+
// way, so the kind is read back off the target: all digits is a pid, anything
|
|
144
|
+
// else is an image. Matching the command line as well used to make a pid kill
|
|
145
|
+
// reach every process whose command line merely contained those digits.
|
|
135
146
|
function matchesTarget(process, target) {
|
|
136
|
-
|
|
137
|
-
process.
|
|
138
|
-
|
|
139
|
-
|
|
147
|
+
if (isPid(target)) {
|
|
148
|
+
return String(process.pid) === target;
|
|
149
|
+
}
|
|
150
|
+
return process.imageName === target || process.imagePath === target;
|
|
151
|
+
}
|
|
152
|
+
function isPid(target) {
|
|
153
|
+
return /^\d+$/.test(target);
|
|
140
154
|
}
|
|
141
155
|
export function nativeProcessToolCapability(platform = process.platform) {
|
|
142
156
|
if (platform === "win32") {
|
package/dist/processTools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processTools.js","sourceRoot":"","sources":["../src/processTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"processTools.js","sourceRoot":"","sources":["../src/processTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import type { LauncherCliResult } from "./launcherCli.js";
|
|
2
2
|
import type { LauncherCommandResult } from "./models.js";
|
|
3
|
-
export
|
|
3
|
+
export interface NormalizeLauncherResultOptions {
|
|
4
|
+
includeRaw?: boolean;
|
|
5
|
+
diagnosticTailLength?: number;
|
|
6
|
+
}
|
|
7
|
+
export declare function normalizeLauncherResult(toolName: string, args: readonly string[], result: LauncherCliResult, options?: NormalizeLauncherResultOptions): LauncherCommandResult;
|
|
4
8
|
//# sourceMappingURL=resultNormalizer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultNormalizer.d.ts","sourceRoot":"","sources":["../src/resultNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"resultNormalizer.d.ts","sourceRoot":"","sources":["../src/resultNormalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,8BAA8B;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAqJD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,MAAM,EAAE,iBAAiB,EACzB,OAAO,GAAE,8BAAmC,GAC3C,qBAAqB,CAoDvB"}
|
package/dist/resultNormalizer.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { parseLauncherOutput } from "./parser.js";
|
|
2
|
+
const defaultDiagnosticTailLength = 2_000;
|
|
2
3
|
function outputFormat(args) {
|
|
3
4
|
return args.includes("--ston") ? "ston" : "text";
|
|
4
5
|
}
|
|
@@ -6,6 +7,27 @@ function trimmedMessage(source) {
|
|
|
6
7
|
const message = source.trim();
|
|
7
8
|
return message ? message : undefined;
|
|
8
9
|
}
|
|
10
|
+
function outputTail(source, maxLength) {
|
|
11
|
+
const message = trimmedMessage(source);
|
|
12
|
+
if (!message) {
|
|
13
|
+
return undefined;
|
|
14
|
+
}
|
|
15
|
+
if (message.length <= maxLength) {
|
|
16
|
+
return message;
|
|
17
|
+
}
|
|
18
|
+
const headLength = Math.min(400, Math.floor(maxLength / 4));
|
|
19
|
+
const omissionMarker = "\n...\n";
|
|
20
|
+
const tailLength = maxLength - headLength - omissionMarker.length;
|
|
21
|
+
return `${message.slice(0, headLength)}${omissionMarker}${message.slice(message.length - tailLength)}`;
|
|
22
|
+
}
|
|
23
|
+
function failedOutputDiagnostic(result, maxLength) {
|
|
24
|
+
const stderr = outputTail(result.stderr, maxLength);
|
|
25
|
+
if (stderr) {
|
|
26
|
+
return { diagnostic: stderr };
|
|
27
|
+
}
|
|
28
|
+
const stdout = outputTail(result.stdout, maxLength);
|
|
29
|
+
return stdout ? { diagnostic: stdout } : undefined;
|
|
30
|
+
}
|
|
9
31
|
function optionValue(args, flag) {
|
|
10
32
|
const index = args.indexOf(flag);
|
|
11
33
|
return index >= 0 ? args[index + 1] : undefined;
|
|
@@ -24,21 +46,11 @@ function templateSourceBootstrapDiagnostic(toolName, args, result) {
|
|
|
24
46
|
}
|
|
25
47
|
return {
|
|
26
48
|
diagnostic: "Pharo Launcher could not list default templates because the active template source inventory is empty or not bootstrapped.",
|
|
27
|
-
action: "
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
function scopedFromBuildVmStoreDiagnostic(toolName, result) {
|
|
31
|
-
if (toolName !== "pharo_launcher_image_create_from_build" ||
|
|
32
|
-
!result.stderr.includes("profile-scoped image create fromBuild")) {
|
|
33
|
-
return undefined;
|
|
34
|
-
}
|
|
35
|
-
return {
|
|
36
|
-
diagnostic: "Profile-scoped fromBuild was refused because Pharo Launcher can launch with the default VM store instead of the configured profile VM directory.",
|
|
37
|
-
action: "Use a non-fromBuild creation path with explicit launch control, or fix Pharo Launcher to initialize PhLVirtualMachineManager from the CLI configuration before fromBuild launch.",
|
|
49
|
+
action: "Verify PHARO_LAUNCHER_MCP_TEMPLATE_SOURCES_DIR, then refresh or seed the active profile template sources with pharo_launcher_template_update before planning image creation.",
|
|
38
50
|
};
|
|
39
51
|
}
|
|
40
52
|
function scopedImageLaunchVmStoreDiagnostic(toolName, result) {
|
|
41
|
-
if (toolName !== "
|
|
53
|
+
if (toolName !== "pharo_launcher_image_start") {
|
|
42
54
|
return undefined;
|
|
43
55
|
}
|
|
44
56
|
if (result.stderr.includes("Refusing profile-scoped image launch")) {
|
|
@@ -52,7 +64,7 @@ function scopedImageLaunchVmStoreDiagnostic(toolName, result) {
|
|
|
52
64
|
}
|
|
53
65
|
return {
|
|
54
66
|
diagnostic: "Profile-scoped image launch could not prepare the profile-local image and VM paths needed for direct launch.",
|
|
55
|
-
action: "Inspect
|
|
67
|
+
action: "Inspect pharo_launcher_image_info, PHARO_LAUNCHER_MCP_IMAGES_DIR and PHARO_LAUNCHER_MCP_VMS_DIR before retrying the launch.",
|
|
56
68
|
};
|
|
57
69
|
}
|
|
58
70
|
function withImageName(value, imageName) {
|
|
@@ -84,7 +96,7 @@ function commandContextData(toolName, args, data) {
|
|
|
84
96
|
return data;
|
|
85
97
|
}
|
|
86
98
|
}
|
|
87
|
-
export function normalizeLauncherResult(toolName, args, result) {
|
|
99
|
+
export function normalizeLauncherResult(toolName, args, result, options = {}) {
|
|
88
100
|
const ok = result.exitCode === 0 && !result.timedOut;
|
|
89
101
|
const format = outputFormat(args);
|
|
90
102
|
const parseResult = ok
|
|
@@ -100,8 +112,15 @@ export function normalizeLauncherResult(toolName, args, result) {
|
|
|
100
112
|
: parsedData;
|
|
101
113
|
const diagnostic = templateSourceBootstrapDiagnostic(toolName, args, result);
|
|
102
114
|
const commandDiagnostic = diagnostic ??
|
|
103
|
-
|
|
104
|
-
|
|
115
|
+
scopedImageLaunchVmStoreDiagnostic(toolName, result) ??
|
|
116
|
+
(!ok
|
|
117
|
+
? failedOutputDiagnostic(result, options.diagnosticTailLength ?? defaultDiagnosticTailLength)
|
|
118
|
+
: undefined);
|
|
119
|
+
const raw = {
|
|
120
|
+
stdout: result.stdout,
|
|
121
|
+
stderr: result.stderr,
|
|
122
|
+
format,
|
|
123
|
+
};
|
|
105
124
|
return {
|
|
106
125
|
ok,
|
|
107
126
|
...(ok && data !== undefined ? { data } : {}),
|
|
@@ -111,11 +130,7 @@ export function normalizeLauncherResult(toolName, args, result) {
|
|
|
111
130
|
format: parseResult.format,
|
|
112
131
|
...(parseResult.message ? { message: parseResult.message } : {}),
|
|
113
132
|
},
|
|
114
|
-
raw: {
|
|
115
|
-
stdout: result.stdout,
|
|
116
|
-
stderr: result.stderr,
|
|
117
|
-
format,
|
|
118
|
-
},
|
|
133
|
+
...(options.includeRaw ? { raw } : {}),
|
|
119
134
|
command: {
|
|
120
135
|
args: [...args],
|
|
121
136
|
durationMs: result.durationMs,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultNormalizer.js","sourceRoot":"","sources":["../src/resultNormalizer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"resultNormalizer.js","sourceRoot":"","sources":["../src/resultNormalizer.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export interface CallToolOptions {
|
|
|
12
12
|
config?: PharoLauncherConfig;
|
|
13
13
|
runner?: LauncherCliRunner;
|
|
14
14
|
timeoutMs?: number;
|
|
15
|
+
includeRaw?: boolean;
|
|
15
16
|
imageCopyVerificationTimeoutMs?: number;
|
|
16
17
|
imageCopyVerificationPollMs?: number;
|
|
17
18
|
sleep?: (milliseconds: number) => Promise<void>;
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAYnE,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAgFxB,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACzD;AAinBD,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,OAAO,EACvB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,UAAU,CAAC,CAarB;AAED,wBAAgB,YAAY,IAAI,MAAM,CAsBrC;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAItD"}
|