@dbx-tools/appkit-mastra 0.9.79 → 0.9.95
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 +90 -48
- package/index.ts +4 -12
- package/lib/index.d.ts +4 -12
- package/lib/index.js +4 -9
- package/lib/src/agents.js +11 -23
- package/lib/src/chat.js +20 -1
- package/lib/src/config.d.ts +9 -11
- package/lib/src/config.js +7 -7
- package/lib/src/filesystems.d.ts +20 -2
- package/lib/src/filesystems.js +29 -2
- package/lib/src/monty-sandbox.d.ts +4 -3
- package/lib/src/monty-sandbox.js +54 -21
- package/lib/src/plugin.js +3 -2
- package/lib/src/remote-skills.d.ts +3 -4
- package/lib/src/remote-skills.js +5 -14
- package/lib/src/server.d.ts +7 -0
- package/lib/src/server.js +33 -2
- package/lib/src/skill-paths.d.ts +8 -4
- package/lib/src/skill-paths.js +12 -6
- package/lib/src/workspaces.d.ts +39 -33
- package/lib/src/workspaces.js +208 -168
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +14 -38
- package/src/agents.ts +11 -24
- package/src/chat.ts +24 -0
- package/src/config.ts +15 -17
- package/src/filesystems.ts +43 -0
- package/src/monty-sandbox.ts +61 -22
- package/src/plugin.ts +2 -0
- package/src/remote-skills.ts +5 -15
- package/src/server.ts +33 -1
- package/src/skill-paths.ts +13 -5
- package/src/workspaces.ts +285 -210
- package/lib/src/monty-native.d.ts +0 -40
- package/lib/src/monty-native.js +0 -100
- package/lib/src/skill-cache.d.ts +0 -94
- package/lib/src/skill-cache.js +0 -251
- package/lib/src/skill-search.d.ts +0 -30
- package/lib/src/skill-search.js +0 -171
- package/src/monty-native.ts +0 -149
- package/src/skill-cache.ts +0 -347
- package/src/skill-search.ts +0 -203
package/lib/src/skill-search.js
DELETED
|
@@ -1,171 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* On-demand skill discovery backed by a materialized workspace catalogue.
|
|
3
|
-
*
|
|
4
|
-
* @module
|
|
5
|
-
*/
|
|
6
|
-
import { errorUtils } from "@dbx-tools/shared-core";
|
|
7
|
-
import { MASTRA_THREAD_ID_KEY } from "@mastra/core/request-context";
|
|
8
|
-
import { createTool } from "@mastra/core/tools";
|
|
9
|
-
import Fuse from "fuse.js";
|
|
10
|
-
import { z } from "zod";
|
|
11
|
-
const DEFAULT_STATE_TTL_MS = 60 * 60 * 1000;
|
|
12
|
-
/** Mastra-compatible search, load, and lazy-read tools over one cached catalogue. */
|
|
13
|
-
export class CatalogueSkillSearchProcessor {
|
|
14
|
-
id = "skill-catalogue-search";
|
|
15
|
-
name = "Skill Catalogue Search";
|
|
16
|
-
providesSkillDiscovery = "on-demand";
|
|
17
|
-
minScore;
|
|
18
|
-
resolve;
|
|
19
|
-
states = new Map();
|
|
20
|
-
topK;
|
|
21
|
-
ttlMs;
|
|
22
|
-
constructor(options) {
|
|
23
|
-
this.resolve = options.resolve;
|
|
24
|
-
this.topK = options.topK ?? 5;
|
|
25
|
-
this.minScore = options.minScore ?? 0.1;
|
|
26
|
-
this.ttlMs = options.ttlMs ?? DEFAULT_STATE_TTL_MS;
|
|
27
|
-
}
|
|
28
|
-
async processInputStep(args) {
|
|
29
|
-
const owner = await this.resolve(args);
|
|
30
|
-
const catalogue = await owner.get(args.abortSignal);
|
|
31
|
-
const state = this.threadState(args);
|
|
32
|
-
args.messageList.addSystem("To discover available skills, call search_skills with a keyword query. " +
|
|
33
|
-
"To load a skill's instructions, call load_skill with the exact skill name. " +
|
|
34
|
-
"Use skill_read only after loading a skill when its instructions require a reference, script, or asset.");
|
|
35
|
-
for (const [skillName, instructions] of state.skills) {
|
|
36
|
-
args.messageList.addSystem(`[Skill: ${skillName}]\n\n${instructions}`);
|
|
37
|
-
}
|
|
38
|
-
const search = new Fuse(catalogue.skills, {
|
|
39
|
-
includeScore: true,
|
|
40
|
-
ignoreLocation: true,
|
|
41
|
-
threshold: 1,
|
|
42
|
-
keys: [
|
|
43
|
-
{ name: "name", weight: 0.5 },
|
|
44
|
-
{ name: "description", weight: 0.35 },
|
|
45
|
-
{ name: "instructions", weight: 0.15 },
|
|
46
|
-
],
|
|
47
|
-
});
|
|
48
|
-
return {
|
|
49
|
-
tools: {
|
|
50
|
-
...(args.tools ?? {}),
|
|
51
|
-
search_skills: createTool({
|
|
52
|
-
id: "search_skills",
|
|
53
|
-
description: "Search for available skills by keyword. Load a useful result with load_skill.",
|
|
54
|
-
inputSchema: z.object({
|
|
55
|
-
query: z.string().trim().min(1, "Query is required").describe("Search keywords."),
|
|
56
|
-
}),
|
|
57
|
-
outputSchema: z.object({
|
|
58
|
-
results: z.array(z.object({
|
|
59
|
-
name: z.string(),
|
|
60
|
-
description: z.string(),
|
|
61
|
-
score: z.number(),
|
|
62
|
-
})),
|
|
63
|
-
message: z.string(),
|
|
64
|
-
}),
|
|
65
|
-
execute: async ({ query }) => {
|
|
66
|
-
const results = search
|
|
67
|
-
.search(query)
|
|
68
|
-
.map((result) => ({
|
|
69
|
-
name: result.item.name,
|
|
70
|
-
description: result.item.description.length > 150
|
|
71
|
-
? `${result.item.description.slice(0, 147)}...`
|
|
72
|
-
: result.item.description,
|
|
73
|
-
score: Math.round((1 - (result.score ?? 1)) * 100) / 100,
|
|
74
|
-
}))
|
|
75
|
-
.filter(({ score }) => score >= this.minScore)
|
|
76
|
-
.slice(0, this.topK);
|
|
77
|
-
return {
|
|
78
|
-
results,
|
|
79
|
-
message: results.length === 0
|
|
80
|
-
? `No skills found matching "${query}". Try different keywords.`
|
|
81
|
-
: `Found ${results.length} skill(s). Use load_skill with the exact skill name to load its instructions.`,
|
|
82
|
-
};
|
|
83
|
-
},
|
|
84
|
-
}),
|
|
85
|
-
load_skill: createTool({
|
|
86
|
-
id: "load_skill",
|
|
87
|
-
description: "Load a skill's full instructions into the conversation.",
|
|
88
|
-
inputSchema: z.object({
|
|
89
|
-
skillName: z.string().describe("Exact skill name returned by search_skills."),
|
|
90
|
-
}),
|
|
91
|
-
outputSchema: z.object({
|
|
92
|
-
success: z.boolean(),
|
|
93
|
-
message: z.string(),
|
|
94
|
-
skillName: z.string().optional(),
|
|
95
|
-
}),
|
|
96
|
-
execute: async ({ skillName }) => {
|
|
97
|
-
if (state.skills.has(skillName)) {
|
|
98
|
-
return {
|
|
99
|
-
success: true,
|
|
100
|
-
message: `Skill "${skillName}" is already loaded.`,
|
|
101
|
-
skillName,
|
|
102
|
-
};
|
|
103
|
-
}
|
|
104
|
-
const skill = catalogue.skills.find(({ name }) => name === skillName);
|
|
105
|
-
if (!skill) {
|
|
106
|
-
return {
|
|
107
|
-
success: false,
|
|
108
|
-
message: `Skill "${skillName}" not found. Use search_skills to find available skills.`,
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
|
-
state.skills.set(skillName, skill.instructions);
|
|
112
|
-
return {
|
|
113
|
-
success: true,
|
|
114
|
-
message: `Skill "${skillName}" loaded. Its instructions are now available as context.`,
|
|
115
|
-
skillName,
|
|
116
|
-
};
|
|
117
|
-
},
|
|
118
|
-
}),
|
|
119
|
-
skill_read: createTool({
|
|
120
|
-
id: "skill_read",
|
|
121
|
-
description: "Read a reference, script, template, or asset from a loaded skill. The path is relative to the skill root.",
|
|
122
|
-
inputSchema: z.object({
|
|
123
|
-
skillName: z.string().describe("Exact loaded skill name."),
|
|
124
|
-
path: z.string().describe("File path relative to the skill root."),
|
|
125
|
-
startLine: z.number().int().positive().optional(),
|
|
126
|
-
endLine: z.number().int().positive().optional(),
|
|
127
|
-
}),
|
|
128
|
-
execute: async ({ skillName, path, startLine, endLine }) => {
|
|
129
|
-
if (!state.skills.has(skillName)) {
|
|
130
|
-
return `Skill "${skillName}" is not loaded. Call load_skill first.`;
|
|
131
|
-
}
|
|
132
|
-
try {
|
|
133
|
-
const source = await owner.readSkillFile(skillName, path, args.abortSignal);
|
|
134
|
-
return lineRange(source, path, startLine, endLine);
|
|
135
|
-
}
|
|
136
|
-
catch (error) {
|
|
137
|
-
return `Could not read "${path}" from skill "${skillName}": ${errorUtils.errorMessage(error)}`;
|
|
138
|
-
}
|
|
139
|
-
},
|
|
140
|
-
}),
|
|
141
|
-
},
|
|
142
|
-
};
|
|
143
|
-
}
|
|
144
|
-
threadState(args) {
|
|
145
|
-
const now = Date.now();
|
|
146
|
-
for (const [key, state] of this.states) {
|
|
147
|
-
if (now - state.lastAccessed > this.ttlMs)
|
|
148
|
-
this.states.delete(key);
|
|
149
|
-
}
|
|
150
|
-
const key = args.requestContext?.get(MASTRA_THREAD_ID_KEY) ?? "default";
|
|
151
|
-
const current = this.states.get(String(key)) ?? {
|
|
152
|
-
lastAccessed: now,
|
|
153
|
-
skills: new Map(),
|
|
154
|
-
};
|
|
155
|
-
current.lastAccessed = now;
|
|
156
|
-
this.states.set(String(key), current);
|
|
157
|
-
return current;
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
function lineRange(source, path, startLine, endLine) {
|
|
161
|
-
if (startLine === undefined && endLine === undefined)
|
|
162
|
-
return source;
|
|
163
|
-
const lines = source.split(/\r?\n/);
|
|
164
|
-
const start = Math.max(1, startLine ?? 1);
|
|
165
|
-
const end = Math.min(lines.length, endLine ?? lines.length);
|
|
166
|
-
if (start > end || start > lines.length) {
|
|
167
|
-
return `File "${path}" has ${lines.length} lines; requested range ${start}-${end} is empty.`;
|
|
168
|
-
}
|
|
169
|
-
return `${path} (lines ${start}-${end} of ${lines.length})\n${lines.slice(start - 1, end).join("\n")}`;
|
|
170
|
-
}
|
|
171
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"skill-search.js","sourceRoot":"","sources":["../../src/skill-search.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * On-demand skill discovery backed by a materialized workspace catalogue.\n *\n * @module\n */\n\nimport { errorUtils } from \"@dbx-tools/shared-core\";\nimport type { ProcessInputStepArgs, Processor } from \"@mastra/core/processors\";\nimport { MASTRA_THREAD_ID_KEY } from \"@mastra/core/request-context\";\nimport { createTool } from \"@mastra/core/tools\";\nimport Fuse from \"fuse.js\";\nimport { z } from \"zod\";\nimport type { SkillCatalogueResolver } from \"./skill-cache.ts\";\n\nconst DEFAULT_STATE_TTL_MS = 60 * 60 * 1000;\n\ninterface ThreadState {\n  lastAccessed: number;\n  skills: Map<string, string>;\n}\n\n/** Configuration for {@link CatalogueSkillSearchProcessor}. */\nexport interface CatalogueSkillSearchProcessorOptions {\n  minScore?: number;\n  resolve: SkillCatalogueResolver;\n  topK?: number;\n  ttlMs?: number;\n}\n\n/** Mastra-compatible search, load, and lazy-read tools over one cached catalogue. */\nexport class CatalogueSkillSearchProcessor implements Processor<\"skill-catalogue-search\"> {\n  readonly id = \"skill-catalogue-search\";\n  readonly name = \"Skill Catalogue Search\";\n  readonly providesSkillDiscovery = \"on-demand\" as const;\n\n  private readonly minScore: number;\n  private readonly resolve: SkillCatalogueResolver;\n  private readonly states = new Map<string, ThreadState>();\n  private readonly topK: number;\n  private readonly ttlMs: number;\n\n  constructor(options: CatalogueSkillSearchProcessorOptions) {\n    this.resolve = options.resolve;\n    this.topK = options.topK ?? 5;\n    this.minScore = options.minScore ?? 0.1;\n    this.ttlMs = options.ttlMs ?? DEFAULT_STATE_TTL_MS;\n  }\n\n  async processInputStep(args: ProcessInputStepArgs): Promise<{ tools: Record<string, unknown> }> {\n    const owner = await this.resolve(args);\n    const catalogue = await owner.get(args.abortSignal);\n    const state = this.threadState(args);\n    args.messageList.addSystem(\n      \"To discover available skills, call search_skills with a keyword query. \" +\n        \"To load a skill's instructions, call load_skill with the exact skill name. \" +\n        \"Use skill_read only after loading a skill when its instructions require a reference, script, or asset.\",\n    );\n    for (const [skillName, instructions] of state.skills) {\n      args.messageList.addSystem(`[Skill: ${skillName}]\\n\\n${instructions}`);\n    }\n    const search = new Fuse(catalogue.skills, {\n      includeScore: true,\n      ignoreLocation: true,\n      threshold: 1,\n      keys: [\n        { name: \"name\", weight: 0.5 },\n        { name: \"description\", weight: 0.35 },\n        { name: \"instructions\", weight: 0.15 },\n      ],\n    });\n    return {\n      tools: {\n        ...(args.tools ?? {}),\n        search_skills: createTool({\n          id: \"search_skills\",\n          description:\n            \"Search for available skills by keyword. Load a useful result with load_skill.\",\n          inputSchema: z.object({\n            query: z.string().trim().min(1, \"Query is required\").describe(\"Search keywords.\"),\n          }),\n          outputSchema: z.object({\n            results: z.array(\n              z.object({\n                name: z.string(),\n                description: z.string(),\n                score: z.number(),\n              }),\n            ),\n            message: z.string(),\n          }),\n          execute: async ({ query }) => {\n            const results = search\n              .search(query)\n              .map((result) => ({\n                name: result.item.name,\n                description:\n                  result.item.description.length > 150\n                    ? `${result.item.description.slice(0, 147)}...`\n                    : result.item.description,\n                score: Math.round((1 - (result.score ?? 1)) * 100) / 100,\n              }))\n              .filter(({ score }) => score >= this.minScore)\n              .slice(0, this.topK);\n            return {\n              results,\n              message:\n                results.length === 0\n                  ? `No skills found matching \"${query}\". Try different keywords.`\n                  : `Found ${results.length} skill(s). Use load_skill with the exact skill name to load its instructions.`,\n            };\n          },\n        }),\n        load_skill: createTool({\n          id: \"load_skill\",\n          description: \"Load a skill's full instructions into the conversation.\",\n          inputSchema: z.object({\n            skillName: z.string().describe(\"Exact skill name returned by search_skills.\"),\n          }),\n          outputSchema: z.object({\n            success: z.boolean(),\n            message: z.string(),\n            skillName: z.string().optional(),\n          }),\n          execute: async ({ skillName }) => {\n            if (state.skills.has(skillName)) {\n              return {\n                success: true,\n                message: `Skill \"${skillName}\" is already loaded.`,\n                skillName,\n              };\n            }\n            const skill = catalogue.skills.find(({ name }) => name === skillName);\n            if (!skill) {\n              return {\n                success: false,\n                message: `Skill \"${skillName}\" not found. Use search_skills to find available skills.`,\n              };\n            }\n            state.skills.set(skillName, skill.instructions);\n            return {\n              success: true,\n              message: `Skill \"${skillName}\" loaded. Its instructions are now available as context.`,\n              skillName,\n            };\n          },\n        }),\n        skill_read: createTool({\n          id: \"skill_read\",\n          description:\n            \"Read a reference, script, template, or asset from a loaded skill. The path is relative to the skill root.\",\n          inputSchema: z.object({\n            skillName: z.string().describe(\"Exact loaded skill name.\"),\n            path: z.string().describe(\"File path relative to the skill root.\"),\n            startLine: z.number().int().positive().optional(),\n            endLine: z.number().int().positive().optional(),\n          }),\n          execute: async ({ skillName, path, startLine, endLine }) => {\n            if (!state.skills.has(skillName)) {\n              return `Skill \"${skillName}\" is not loaded. Call load_skill first.`;\n            }\n            try {\n              const source = await owner.readSkillFile(skillName, path, args.abortSignal);\n              return lineRange(source, path, startLine, endLine);\n            } catch (error) {\n              return `Could not read \"${path}\" from skill \"${skillName}\": ${errorUtils.errorMessage(error)}`;\n            }\n          },\n        }),\n      },\n    };\n  }\n\n  private threadState(args: ProcessInputStepArgs): ThreadState {\n    const now = Date.now();\n    for (const [key, state] of this.states) {\n      if (now - state.lastAccessed > this.ttlMs) this.states.delete(key);\n    }\n    const key = args.requestContext?.get(MASTRA_THREAD_ID_KEY) ?? \"default\";\n    const current = this.states.get(String(key)) ?? {\n      lastAccessed: now,\n      skills: new Map<string, string>(),\n    };\n    current.lastAccessed = now;\n    this.states.set(String(key), current);\n    return current;\n  }\n}\n\nfunction lineRange(\n  source: string,\n  path: string,\n  startLine: number | undefined,\n  endLine: number | undefined,\n): string {\n  if (startLine === undefined && endLine === undefined) return source;\n  const lines = source.split(/\\r?\\n/);\n  const start = Math.max(1, startLine ?? 1);\n  const end = Math.min(lines.length, endLine ?? lines.length);\n  if (start > end || start > lines.length) {\n    return `File \"${path}\" has ${lines.length} lines; requested range ${start}-${end} is empty.`;\n  }\n  return `${path} (lines ${start}-${end} of ${lines.length})\\n${lines.slice(start - 1, end).join(\"\\n\")}`;\n}\n"]}
|
package/src/monty-native.ts
DELETED
|
@@ -1,149 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Ensures Monty's platform native package is present before the Node addon loads.
|
|
3
|
-
*
|
|
4
|
-
* `@pydantic/monty` ships `@pydantic/monty-<platform>` as optionalDependencies.
|
|
5
|
-
* npm can skip those (https://github.com/npm/cli/issues/4828), which surfaces as
|
|
6
|
-
* "Cannot find native binding". This module installs only the current platform
|
|
7
|
-
* package, at the already-installed `@pydantic/monty` version, without rewriting
|
|
8
|
-
* package.json.
|
|
9
|
-
*
|
|
10
|
-
* @module
|
|
11
|
-
*/
|
|
12
|
-
|
|
13
|
-
import { createRequire } from "node:module";
|
|
14
|
-
import { COMMAND_NOT_FOUND_EXIT_CODE, exec } from "@dbx-tools/core";
|
|
15
|
-
import { errorUtils, log } from "@dbx-tools/shared-core";
|
|
16
|
-
|
|
17
|
-
const logger = log.logger("mastra/monty-native");
|
|
18
|
-
const requireFromHere = createRequire(import.meta.url);
|
|
19
|
-
|
|
20
|
-
/** Result of spawning the package installer. */
|
|
21
|
-
export interface MontyNativeInstallResult {
|
|
22
|
-
exitCode: number | null;
|
|
23
|
-
stdout: string;
|
|
24
|
-
stderr: string;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
/** Installer used by {@link ensureMontyNativeBinding}. */
|
|
28
|
-
export type MontyNativeInstaller = (
|
|
29
|
-
command: string,
|
|
30
|
-
args: readonly string[],
|
|
31
|
-
options: { cwd: string },
|
|
32
|
-
) => Promise<MontyNativeInstallResult>;
|
|
33
|
-
|
|
34
|
-
/** Overrides for {@link ensureMontyNativeBinding} (tests inject resolve/install). */
|
|
35
|
-
export interface EnsureMontyNativeBindingOptions {
|
|
36
|
-
/** Working directory for the in-place install. Defaults to `process.cwd()`. */
|
|
37
|
-
cwd?: string;
|
|
38
|
-
/** Module resolver; defaults to `createRequire(import.meta.url).resolve`. */
|
|
39
|
-
resolve?: (specifier: string) => string;
|
|
40
|
-
/** Package installer; defaults to npm, then bun when npm is missing. */
|
|
41
|
-
install?: MontyNativeInstaller;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
/**
|
|
45
|
-
* npm package that ships Monty's `.node` addon and `monty` binary for this
|
|
46
|
-
* process. Matches `@pydantic/monty`'s `platformTriple()` / optionalDependencies.
|
|
47
|
-
*/
|
|
48
|
-
export function montyNativeBindingPackage(
|
|
49
|
-
platform: NodeJS.Platform = process.platform,
|
|
50
|
-
arch: string = process.arch,
|
|
51
|
-
): string | undefined {
|
|
52
|
-
if (platform === "darwin" && (arch === "x64" || arch === "arm64")) {
|
|
53
|
-
return `@pydantic/monty-darwin-${arch}`;
|
|
54
|
-
}
|
|
55
|
-
if (platform === "linux" && (arch === "x64" || arch === "arm64")) {
|
|
56
|
-
return `@pydantic/monty-linux-${arch}-gnu`;
|
|
57
|
-
}
|
|
58
|
-
if (platform === "win32" && arch === "x64") {
|
|
59
|
-
return "@pydantic/monty-win32-x64-msvc";
|
|
60
|
-
}
|
|
61
|
-
return undefined;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
/**
|
|
65
|
-
* Resolve the current platform's Monty native package, installing it in place
|
|
66
|
-
* when npm omitted the optional dependency.
|
|
67
|
-
*/
|
|
68
|
-
export async function ensureMontyNativeBinding(
|
|
69
|
-
options: EnsureMontyNativeBindingOptions = {},
|
|
70
|
-
): Promise<void> {
|
|
71
|
-
const pkg = montyNativeBindingPackage();
|
|
72
|
-
if (!pkg) return;
|
|
73
|
-
|
|
74
|
-
const resolve = options.resolve ?? ((specifier: string) => requireFromHere.resolve(specifier));
|
|
75
|
-
if (isResolvable(pkg, resolve)) return;
|
|
76
|
-
|
|
77
|
-
const version = montyPackageVersion(resolve);
|
|
78
|
-
const spec = `${pkg}@${version}`;
|
|
79
|
-
const cwd = options.cwd ?? process.cwd();
|
|
80
|
-
logger.warn("native-binding:missing", { package: spec, cwd });
|
|
81
|
-
|
|
82
|
-
const install = options.install ?? defaultInstaller;
|
|
83
|
-
const output = await installNativePackage(spec, cwd, install);
|
|
84
|
-
if (!isResolvable(pkg, resolve)) {
|
|
85
|
-
throw new Error(
|
|
86
|
-
`Monty native binding ${spec} is still missing after ${output.command}. ${output.detail}`,
|
|
87
|
-
);
|
|
88
|
-
}
|
|
89
|
-
logger.info("native-binding:installed", { package: spec, command: output.command });
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
function isResolvable(specifier: string, resolve: (specifier: string) => string): boolean {
|
|
93
|
-
try {
|
|
94
|
-
resolve(`${specifier}/package.json`);
|
|
95
|
-
return true;
|
|
96
|
-
} catch {
|
|
97
|
-
return false;
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
function montyPackageVersion(resolve: (specifier: string) => string): string {
|
|
102
|
-
const pkg = requireFromHere(resolve("@pydantic/monty/package.json")) as { version?: string };
|
|
103
|
-
const version = pkg.version?.trim();
|
|
104
|
-
if (!version) throw new Error("Installed @pydantic/monty has no version");
|
|
105
|
-
return version;
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
async function installNativePackage(
|
|
109
|
-
spec: string,
|
|
110
|
-
cwd: string,
|
|
111
|
-
install: MontyNativeInstaller,
|
|
112
|
-
): Promise<{ command: string; detail: string }> {
|
|
113
|
-
const npm = await install("npm", ["install", spec, "--no-save", "--no-package-lock"], { cwd });
|
|
114
|
-
if (npm.exitCode === 0) return { command: `npm install ${spec}`, detail: npm.stdout };
|
|
115
|
-
if (npm.exitCode !== COMMAND_NOT_FOUND_EXIT_CODE) {
|
|
116
|
-
throw new Error(
|
|
117
|
-
`Failed to install ${spec} with npm (exit ${npm.exitCode}): ${installDetail(npm)}`,
|
|
118
|
-
);
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
const bun = await install("bun", ["add", spec, "--no-save"], { cwd });
|
|
122
|
-
if (bun.exitCode === 0) return { command: `bun add ${spec}`, detail: bun.stdout };
|
|
123
|
-
throw new Error(
|
|
124
|
-
`Failed to install ${spec}: npm was not found, bun add exited ${bun.exitCode}: ${installDetail(bun)}`,
|
|
125
|
-
);
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
async function defaultInstaller(
|
|
129
|
-
command: string,
|
|
130
|
-
args: readonly string[],
|
|
131
|
-
options: { cwd: string },
|
|
132
|
-
): Promise<MontyNativeInstallResult> {
|
|
133
|
-
const result = await exec.spawn(command, [...args], {
|
|
134
|
-
cwd: options.cwd,
|
|
135
|
-
stdout: "capture",
|
|
136
|
-
stderr: "capture",
|
|
137
|
-
stdin: "ignore",
|
|
138
|
-
check: false,
|
|
139
|
-
});
|
|
140
|
-
return {
|
|
141
|
-
exitCode: result.exitCode,
|
|
142
|
-
stdout: result.stdout,
|
|
143
|
-
stderr: result.stderr,
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
function installDetail(result: MontyNativeInstallResult): string {
|
|
148
|
-
return errorUtils.errorMessage(result.stderr || result.stdout || `exit ${result.exitCode}`);
|
|
149
|
-
}
|