@marifold/core 0.65.0 → 0.66.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/dist/agent/AgentRunner.d.ts +6 -0
- package/dist/agent/AgentRunner.d.ts.map +1 -1
- package/dist/agent/AgentRunner.js +3 -0
- package/dist/agent/AgentRunner.js.map +1 -1
- package/dist/agent/RunWorkspace.d.ts +10 -0
- package/dist/agent/RunWorkspace.d.ts.map +1 -1
- package/dist/agent/RunWorkspace.js +19 -1
- package/dist/agent/RunWorkspace.js.map +1 -1
- package/dist/agent/tools/ReadFileTool.d.ts +7 -0
- package/dist/agent/tools/ReadFileTool.d.ts.map +1 -1
- package/dist/agent/tools/ReadFileTool.js +24 -2
- package/dist/agent/tools/ReadFileTool.js.map +1 -1
- package/dist/app/AppStore.d.ts +11 -1
- package/dist/app/AppStore.d.ts.map +1 -1
- package/dist/app/AppStore.js +105 -16
- package/dist/app/AppStore.js.map +1 -1
- package/dist/app/SkillAppCompiler.d.ts.map +1 -1
- package/dist/app/SkillAppCompiler.js +314 -44
- package/dist/app/SkillAppCompiler.js.map +1 -1
- package/dist/app/SkillAppDsl.d.ts +60 -4
- package/dist/app/SkillAppDsl.d.ts.map +1 -1
- package/dist/app/SkillAppDsl.js +44 -0
- package/dist/app/SkillAppDsl.js.map +1 -1
- package/dist/app/SkillAppInstanceRegistry.d.ts +3 -2
- package/dist/app/SkillAppInstanceRegistry.d.ts.map +1 -1
- package/dist/app/SkillAppInstanceRegistry.js +191 -11
- package/dist/app/SkillAppInstanceRegistry.js.map +1 -1
- package/dist/app/SkillAppResolver.d.ts +5 -2
- package/dist/app/SkillAppResolver.d.ts.map +1 -1
- package/dist/app/SkillAppResolver.js +66 -15
- package/dist/app/SkillAppResolver.js.map +1 -1
- package/dist/app/SkillAppSchema.d.ts +84 -8
- package/dist/app/SkillAppSchema.d.ts.map +1 -1
- package/dist/app/SkillAppSchema.js +2 -1
- package/dist/app/SkillAppSchema.js.map +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -4
- package/dist/index.js.map +1 -1
- package/dist/runtime/MarifoldRuntime.d.ts +12 -6
- package/dist/runtime/MarifoldRuntime.d.ts.map +1 -1
- package/dist/runtime/MarifoldRuntime.js +169 -28
- package/dist/runtime/MarifoldRuntime.js.map +1 -1
- package/dist/skill/SkillStore.d.ts +2 -2
- package/dist/skill/SkillStore.js +2 -2
- package/package.json +1 -1
package/dist/app/AppStore.js
CHANGED
|
@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.AppStore = void 0;
|
|
37
37
|
const fs = __importStar(require("fs"));
|
|
38
|
+
const os = __importStar(require("os"));
|
|
38
39
|
const path = __importStar(require("path"));
|
|
39
40
|
const MarifoldError_1 = require("../errors/MarifoldError");
|
|
40
41
|
const SkillValidator_1 = require("../skill/SkillValidator");
|
|
@@ -45,8 +46,10 @@ const SKILL_APP_DEFINITION_FILE = 'skillapp.ts';
|
|
|
45
46
|
* are skipped by list(); get() reports their exact validation failure. */
|
|
46
47
|
class AppStore {
|
|
47
48
|
directory;
|
|
48
|
-
|
|
49
|
+
options;
|
|
50
|
+
constructor(directory, options = {}) {
|
|
49
51
|
this.directory = directory;
|
|
52
|
+
this.options = options;
|
|
50
53
|
}
|
|
51
54
|
list() {
|
|
52
55
|
if (!fs.existsSync(this.directory))
|
|
@@ -77,7 +80,9 @@ class AppStore {
|
|
|
77
80
|
if (definition.app.name !== name) {
|
|
78
81
|
throw MarifoldError_1.MarifoldError.appInvalid(`App app.name '${definition.app.name}' must match bundle directory '${name}'.`, realSource);
|
|
79
82
|
}
|
|
83
|
+
definition.permissions = resolvePermissions(bundle, definition.permissions ?? [], realSource);
|
|
80
84
|
this.validateLocalSkills(name, definition);
|
|
85
|
+
this.validateProfileSkills(definition);
|
|
81
86
|
return definition;
|
|
82
87
|
}
|
|
83
88
|
require(name) {
|
|
@@ -98,6 +103,12 @@ class AppStore {
|
|
|
98
103
|
throw MarifoldError_1.MarifoldError.skillNotFound(skillName);
|
|
99
104
|
return requireConfinedFile(bundle, source, `App-local skill '${skillName}'`);
|
|
100
105
|
}
|
|
106
|
+
requireProfileSkill(profile, skillName) {
|
|
107
|
+
const skill = this.options.resolveProfileSkill?.(profile, skillName);
|
|
108
|
+
if (!skill)
|
|
109
|
+
throw MarifoldError_1.MarifoldError.skillNotFound(skillName);
|
|
110
|
+
return skill;
|
|
111
|
+
}
|
|
101
112
|
validateLocalSkills(appName, definition) {
|
|
102
113
|
for (const registered of definition.skills) {
|
|
103
114
|
const source = this.requireLocalSkillSource(appName, registered.name);
|
|
@@ -108,27 +119,105 @@ class AppStore {
|
|
|
108
119
|
if (skill.mode && skill.mode !== 'chat') {
|
|
109
120
|
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp v1 only supports chat-mode Skills; '${skill.name}' uses '${skill.mode}'.`, source);
|
|
110
121
|
}
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
122
|
+
for (const operation of definition.operations.filter(candidate => candidate.profile === undefined && candidate.skill === registered.name)) {
|
|
123
|
+
operation.requiredInputs = this.validateOperationBindings(skill, operation, source);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
validateProfileSkills(definition) {
|
|
128
|
+
for (const operation of definition.operations.filter(candidate => candidate.profile !== undefined)) {
|
|
129
|
+
const profile = (definition.profiles ?? []).find(candidate => candidate.name === operation.profile);
|
|
130
|
+
if (!profile) {
|
|
131
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operation.name}' references missing profile '${operation.profile}'.`);
|
|
132
|
+
}
|
|
133
|
+
if (!this.options.resolveProfileSkill) {
|
|
134
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp '${definition.app.name}' requires profile-backed Skill resolution.`);
|
|
135
|
+
}
|
|
136
|
+
const skillNames = operation.skill ? [operation.skill] : (operation.skillOptions ?? []);
|
|
137
|
+
if (skillNames.length === 0) {
|
|
138
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operation.name}' has no profile Skill candidates.`);
|
|
139
|
+
}
|
|
140
|
+
const requiredInputs = new Set([
|
|
141
|
+
...(operation.skillState ? [operation.skillState] : []),
|
|
142
|
+
...(operation.input ? [operation.input] : []),
|
|
143
|
+
]);
|
|
144
|
+
for (const skillName of skillNames) {
|
|
145
|
+
const skill = this.requireProfileSkill(profile.profile, skillName);
|
|
146
|
+
for (const input of this.validateOperationBindings(skill, operation, skill.source)) {
|
|
147
|
+
requiredInputs.add(input);
|
|
123
148
|
}
|
|
124
|
-
operation.requiredInputs = [...new Set(skill.variables
|
|
125
|
-
.filter(variable => variable.required && variable.default === undefined)
|
|
126
|
-
.map(variable => operation.parameters[variable.name]))];
|
|
127
149
|
}
|
|
150
|
+
operation.requiredInputs = [...requiredInputs];
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
validateOperationBindings(skill, operation, source) {
|
|
154
|
+
const variables = new Set(skill.variables.map(variable => variable.name));
|
|
155
|
+
const parameters = new Set(Object.keys(operation.parameters));
|
|
156
|
+
const unknown = [...parameters].filter(name => !variables.has(name));
|
|
157
|
+
if (unknown.length > 0) {
|
|
158
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operation.name}' supplies unknown Skill parameter(s): ${unknown.join(', ')}.`, source);
|
|
128
159
|
}
|
|
160
|
+
const missing = skill.variables
|
|
161
|
+
.filter(variable => variable.required && variable.default === undefined && !parameters.has(variable.name))
|
|
162
|
+
.map(variable => variable.name);
|
|
163
|
+
if (missing.length > 0) {
|
|
164
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operation.name}' does not bind required Skill parameter(s): ${missing.join(', ')}.`, source);
|
|
165
|
+
}
|
|
166
|
+
return [...new Set([
|
|
167
|
+
...(operation.input ? [operation.input] : []),
|
|
168
|
+
...skill.variables
|
|
169
|
+
.filter(variable => variable.required && variable.default === undefined)
|
|
170
|
+
.map(variable => operation.parameters[variable.name]),
|
|
171
|
+
])];
|
|
129
172
|
}
|
|
130
173
|
}
|
|
131
174
|
exports.AppStore = AppStore;
|
|
175
|
+
function resolvePermissions(bundle, permissions, source) {
|
|
176
|
+
const userHome = fs.realpathSync(os.homedir());
|
|
177
|
+
const privateAppHome = path.join(userHome, '.marifold');
|
|
178
|
+
const bundleRoot = fs.realpathSync(bundle);
|
|
179
|
+
return permissions.map(permission => {
|
|
180
|
+
const requested = permission.path === '~'
|
|
181
|
+
? userHome
|
|
182
|
+
: permission.path.startsWith('~/')
|
|
183
|
+
? path.join(userHome, permission.path.slice(2))
|
|
184
|
+
: path.isAbsolute(permission.path)
|
|
185
|
+
? permission.path
|
|
186
|
+
: path.join(bundle, permission.path);
|
|
187
|
+
let resolved;
|
|
188
|
+
let stat;
|
|
189
|
+
try {
|
|
190
|
+
resolved = fs.realpathSync(requested);
|
|
191
|
+
stat = fs.statSync(resolved);
|
|
192
|
+
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`Declared ${permission.kind} permission '${permission.path}' cannot be resolved: ${error instanceof Error ? error.message : String(error)}`, source);
|
|
195
|
+
}
|
|
196
|
+
if (permission.kind === 'file' && !stat.isFile()) {
|
|
197
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`Declared file permission '${permission.path}' is not a regular file.`, source);
|
|
198
|
+
}
|
|
199
|
+
if (permission.kind === 'folder' && !stat.isDirectory()) {
|
|
200
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`Declared folder permission '${permission.path}' is not a directory.`, source);
|
|
201
|
+
}
|
|
202
|
+
if (permission.kind === 'folder' && isBroadPermissionRoot(resolved, userHome, privateAppHome)) {
|
|
203
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`Declared folder permission '${permission.path}' is too broad or sensitive.`, source);
|
|
204
|
+
}
|
|
205
|
+
if (isInside(resolved, privateAppHome) && !isInside(resolved, bundleRoot)) {
|
|
206
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`Declared permission '${permission.path}' cannot expose Marifold private state.`, source);
|
|
207
|
+
}
|
|
208
|
+
return { ...permission, path: resolved };
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
function isBroadPermissionRoot(target, userHome, privateAppHome) {
|
|
212
|
+
return target === path.parse(target).root
|
|
213
|
+
|| target === userHome
|
|
214
|
+
|| target === privateAppHome
|
|
215
|
+
|| isInside(privateAppHome, target);
|
|
216
|
+
}
|
|
217
|
+
function isInside(target, root) {
|
|
218
|
+
const relative = path.relative(root, target);
|
|
219
|
+
return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
|
|
220
|
+
}
|
|
132
221
|
function requireConfinedFile(bundle, source, label) {
|
|
133
222
|
const bundleRoot = fs.realpathSync(bundle);
|
|
134
223
|
const realSource = fs.realpathSync(source);
|
package/dist/app/AppStore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppStore.js","sourceRoot":"","sources":["../../src/app/AppStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,EAAE,+BAAW;AACzB,MAAY,IAAI,iCAAa;AAC7B,2DAAwD;AACxD,4DAAqD;
|
|
1
|
+
{"version":3,"file":"AppStore.js","sourceRoot":"","sources":["../../src/app/AppStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkillAppCompiler.d.ts","sourceRoot":"","sources":["../../src/app/SkillAppCompiler.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"SkillAppCompiler.d.ts","sourceRoot":"","sources":["../../src/app/SkillAppCompiler.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,kBAAkB,EAWnB,MAAM,kBAAkB,CAAC;AAsC1B;2EAC2E;AAC3E,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,SAAgB,GAAG,kBAAkB,CA+E9F"}
|