@marifold/core 0.64.1 → 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 +7 -0
- package/dist/agent/AgentRunner.d.ts.map +1 -1
- package/dist/agent/AgentRunner.js +27 -1
- 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/config/ConfigLoader.d.ts.map +1 -1
- package/dist/config/ConfigLoader.js +17 -3
- package/dist/config/ConfigLoader.js.map +1 -1
- package/dist/config/ConfigManager.d.ts.map +1 -1
- package/dist/config/ConfigManager.js +13 -2
- package/dist/config/ConfigManager.js.map +1 -1
- package/dist/config/ConfigSchema.d.ts +8 -2
- package/dist/config/ConfigSchema.d.ts.map +1 -1
- package/dist/config/ConfigSchema.js.map +1 -1
- package/dist/config/MarifoldOpenAICompatProvider.d.ts +1 -1
- package/dist/config/MarifoldOpenAICompatProvider.d.ts.map +1 -1
- package/dist/config/MarifoldOpenAICompatProvider.js +8 -6
- package/dist/config/MarifoldOpenAICompatProvider.js.map +1 -1
- package/dist/config/ProviderFactory.d.ts +6 -4
- package/dist/config/ProviderFactory.d.ts.map +1 -1
- package/dist/config/ProviderFactory.js +41 -6
- package/dist/config/ProviderFactory.js.map +1 -1
- package/dist/index.d.ts +8 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -3
- package/dist/index.js.map +1 -1
- package/dist/runtime/MarifoldRuntime.d.ts +17 -9
- package/dist/runtime/MarifoldRuntime.d.ts.map +1 -1
- package/dist/runtime/MarifoldRuntime.js +270 -59
- package/dist/runtime/MarifoldRuntime.js.map +1 -1
- package/dist/runtime/MarifoldTypes.d.ts +1 -1
- package/dist/runtime/MarifoldTypes.d.ts.map +1 -1
- package/dist/runtime/NativeWebSearch.d.ts +9 -0
- package/dist/runtime/NativeWebSearch.d.ts.map +1 -0
- package/dist/runtime/NativeWebSearch.js +17 -0
- package/dist/runtime/NativeWebSearch.js.map +1 -0
- package/dist/search/OllamaSearchBackend.d.ts +22 -0
- package/dist/search/OllamaSearchBackend.d.ts.map +1 -0
- package/dist/search/OllamaSearchBackend.js +64 -0
- package/dist/search/OllamaSearchBackend.js.map +1 -0
- package/dist/search/createSearchBackend.d.ts +4 -3
- package/dist/search/createSearchBackend.d.ts.map +1 -1
- package/dist/search/createSearchBackend.js +13 -3
- package/dist/search/createSearchBackend.js.map +1 -1
- package/dist/skill/SkillStore.d.ts +2 -2
- package/dist/skill/SkillStore.js +2 -2
- package/package.json +1 -1
|
@@ -1,8 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.SkillAppInstanceRegistry = void 0;
|
|
4
37
|
const crypto_1 = require("crypto");
|
|
38
|
+
const path = __importStar(require("path"));
|
|
5
39
|
const MarifoldError_1 = require("../errors/MarifoldError");
|
|
40
|
+
const RunWorkspace_1 = require("../agent/RunWorkspace");
|
|
41
|
+
const ImageOptimizer_1 = require("../images/ImageOptimizer");
|
|
6
42
|
const DEFAULT_MAX_INSTANCES = 128;
|
|
7
43
|
const DEFAULT_INSTANCE_RETENTION_MS = 30 * 60 * 1000;
|
|
8
44
|
/** Ephemeral service-owned state for declarative SkillApp bindings/triggers. */
|
|
@@ -28,8 +64,15 @@ class SkillAppInstanceRegistry {
|
|
|
28
64
|
id,
|
|
29
65
|
appName,
|
|
30
66
|
state: Object.fromEntries(definition.states.map(item => [item.name, item.initial])),
|
|
67
|
+
attachments: Object.fromEntries((definition.attachmentStates ?? []).map(item => [item.name, []])),
|
|
68
|
+
};
|
|
69
|
+
const record = {
|
|
70
|
+
definition,
|
|
71
|
+
snapshot,
|
|
72
|
+
operations: new Map(),
|
|
73
|
+
historyByProfile: new Map(),
|
|
74
|
+
attachmentsByState: new Map((definition.attachmentStates ?? []).map(item => [item.name, []])),
|
|
31
75
|
};
|
|
32
|
-
const record = { definition, snapshot, operations: new Map() };
|
|
33
76
|
this.instances.set(id, record);
|
|
34
77
|
this.refreshExpiry(record);
|
|
35
78
|
return cloneSnapshot(snapshot);
|
|
@@ -62,10 +105,10 @@ class SkillAppInstanceRegistry {
|
|
|
62
105
|
if (changed.length === 0)
|
|
63
106
|
return { status: 'idle', instance: cloneSnapshot(record.snapshot) };
|
|
64
107
|
const triggers = record.definition.triggers.filter(trigger => trigger.onChange.some(name => changed.includes(name)));
|
|
65
|
-
const
|
|
66
|
-
|
|
67
|
-
for (const operation of
|
|
68
|
-
record.snapshot
|
|
108
|
+
const affectedOperations = record.definition.operations.filter(operation => operationInputStates(operation).some(name => changed.includes(name)));
|
|
109
|
+
const missingOperations = affectedOperations.filter(operation => !operationIsRunnable(operation.requiredInputs, record.snapshot.state));
|
|
110
|
+
for (const operation of affectedOperations) {
|
|
111
|
+
markOutputStale(record.snapshot, operation.output);
|
|
69
112
|
this.cancelOperation(record, operation.name);
|
|
70
113
|
}
|
|
71
114
|
const runnableTriggers = triggers.filter(trigger => {
|
|
@@ -98,7 +141,7 @@ class SkillAppInstanceRegistry {
|
|
|
98
141
|
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp '${record.definition.app.name}' has no operation '${operationName}'.`);
|
|
99
142
|
}
|
|
100
143
|
if (!operationIsRunnable(operation.requiredInputs, record.snapshot.state)) {
|
|
101
|
-
record.snapshot
|
|
144
|
+
markOutputStale(record.snapshot, operation.output);
|
|
102
145
|
this.cancelOperation(record, operationName);
|
|
103
146
|
return Promise.resolve({
|
|
104
147
|
status: 'idle',
|
|
@@ -109,6 +152,24 @@ class SkillAppInstanceRegistry {
|
|
|
109
152
|
}
|
|
110
153
|
return this.executeLatest(record, operationName, 0);
|
|
111
154
|
}
|
|
155
|
+
updateAttachments(instanceId, stateName, attachments) {
|
|
156
|
+
const record = this.require(instanceId);
|
|
157
|
+
this.refreshExpiry(record);
|
|
158
|
+
if (!(record.definition.attachmentStates ?? []).some(state => state.name === stateName)) {
|
|
159
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp received unknown attachment state '${stateName}'.`);
|
|
160
|
+
}
|
|
161
|
+
const normalized = validateAttachments(attachments);
|
|
162
|
+
record.attachmentsByState.set(stateName, normalized);
|
|
163
|
+
record.snapshot.attachments = {
|
|
164
|
+
...(record.snapshot.attachments ?? {}),
|
|
165
|
+
[stateName]: normalized.map(({ name, mediaType, size, kind }) => ({ name, mediaType, size, kind })),
|
|
166
|
+
};
|
|
167
|
+
for (const operation of record.definition.operations.filter(candidate => candidate.attachments === stateName)) {
|
|
168
|
+
markOutputStale(record.snapshot, operation.output);
|
|
169
|
+
this.cancelOperation(record, operation.name);
|
|
170
|
+
}
|
|
171
|
+
return { status: 'idle', instance: cloneSnapshot(record.snapshot) };
|
|
172
|
+
}
|
|
112
173
|
delete(instanceId) {
|
|
113
174
|
const record = this.instances.get(instanceId);
|
|
114
175
|
if (!record)
|
|
@@ -145,12 +206,23 @@ class SkillAppInstanceRegistry {
|
|
|
145
206
|
active.timer = undefined;
|
|
146
207
|
active.controller = new AbortController();
|
|
147
208
|
const input = { ...record.snapshot.state };
|
|
148
|
-
|
|
209
|
+
const operation = record.definition.operations.find(candidate => candidate.name === operationName);
|
|
210
|
+
const historyKey = operation.profile;
|
|
211
|
+
const history = operation.execution.history && historyKey
|
|
212
|
+
? [...(record.historyByProfile.get(historyKey) ?? [])]
|
|
213
|
+
: undefined;
|
|
214
|
+
const attachments = operation.attachments
|
|
215
|
+
? [...(record.attachmentsByState.get(operation.attachments) ?? [])]
|
|
216
|
+
: undefined;
|
|
217
|
+
void this.runtime.runSkillAppOperation(record.definition.app.name, operationName, input, active.controller.signal, history, attachments).then(result => {
|
|
149
218
|
if (record.operations.get(operationName)?.generation !== generation)
|
|
150
219
|
return;
|
|
151
220
|
if (result.status === 'ok') {
|
|
152
|
-
const operation = record.definition.operations.find(candidate => candidate.name === operationName);
|
|
153
221
|
record.snapshot.state[operation.output] = result.data.text;
|
|
222
|
+
markOutputFresh(record.snapshot, operation.output);
|
|
223
|
+
if (operation.execution.history && historyKey) {
|
|
224
|
+
record.historyByProfile.set(historyKey, appendHistory(record.historyByProfile.get(historyKey) ?? [], operationInputText(operation, input), result.data.text));
|
|
225
|
+
}
|
|
154
226
|
}
|
|
155
227
|
record.operations.delete(operationName);
|
|
156
228
|
resolve({ status: 'completed', operation: operationName, instance: cloneSnapshot(record.snapshot), result });
|
|
@@ -198,11 +270,33 @@ class SkillAppInstanceRegistry {
|
|
|
198
270
|
}
|
|
199
271
|
}
|
|
200
272
|
exports.SkillAppInstanceRegistry = SkillAppInstanceRegistry;
|
|
273
|
+
function operationInputText(operation, state) {
|
|
274
|
+
if (operation.input)
|
|
275
|
+
return state[operation.input] ?? '';
|
|
276
|
+
const values = Object.values(operation.parameters)
|
|
277
|
+
.map(name => state[name] ?? '')
|
|
278
|
+
.filter(value => value.trim().length > 0);
|
|
279
|
+
return values.join('\n');
|
|
280
|
+
}
|
|
281
|
+
function appendHistory(history, user, assistant) {
|
|
282
|
+
const next = [
|
|
283
|
+
...history,
|
|
284
|
+
{ role: 'user', content: user },
|
|
285
|
+
{ role: 'assistant', content: assistant },
|
|
286
|
+
].slice(-20);
|
|
287
|
+
let chars = next.reduce((sum, turn) => sum + turn.content.length, 0);
|
|
288
|
+
while (next.length > 2 && chars > 16_000) {
|
|
289
|
+
const removed = next.shift();
|
|
290
|
+
chars -= removed?.content.length ?? 0;
|
|
291
|
+
}
|
|
292
|
+
return next;
|
|
293
|
+
}
|
|
201
294
|
function validateSelectValue(definition, stateName, value) {
|
|
202
295
|
const selects = flatten(definition.layout).filter(item => item.component === 'select' && item.bind === stateName);
|
|
203
296
|
for (const select of selects) {
|
|
204
|
-
|
|
205
|
-
|
|
297
|
+
const allowed = (select.options ?? []).map(option => typeof option === 'string' ? option : option.value);
|
|
298
|
+
if (!allowed.includes(value)) {
|
|
299
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp state '${stateName}' must be one of: ${allowed.join(', ')}.`);
|
|
206
300
|
}
|
|
207
301
|
}
|
|
208
302
|
}
|
|
@@ -210,7 +304,93 @@ function flatten(items) {
|
|
|
210
304
|
return items.flatMap(item => [item, ...flatten(item.children ?? [])]);
|
|
211
305
|
}
|
|
212
306
|
function cloneSnapshot(snapshot) {
|
|
213
|
-
return {
|
|
307
|
+
return {
|
|
308
|
+
...snapshot,
|
|
309
|
+
state: { ...snapshot.state },
|
|
310
|
+
...(snapshot.staleOutputs ? { staleOutputs: [...snapshot.staleOutputs] } : {}),
|
|
311
|
+
...(snapshot.attachments ? {
|
|
312
|
+
attachments: Object.fromEntries(Object.entries(snapshot.attachments).map(([name, attachments]) => [
|
|
313
|
+
name,
|
|
314
|
+
attachments.map(attachment => ({ ...attachment })),
|
|
315
|
+
])),
|
|
316
|
+
} : {}),
|
|
317
|
+
};
|
|
318
|
+
}
|
|
319
|
+
function operationInputStates(operation) {
|
|
320
|
+
return [...new Set([
|
|
321
|
+
...(operation.skillState ? [operation.skillState] : []),
|
|
322
|
+
...(operation.input ? [operation.input] : []),
|
|
323
|
+
...operation.requiredInputs,
|
|
324
|
+
...Object.values(operation.parameters),
|
|
325
|
+
])];
|
|
326
|
+
}
|
|
327
|
+
function markOutputStale(snapshot, output) {
|
|
328
|
+
if (!(snapshot.state[output] ?? '').trim())
|
|
329
|
+
return;
|
|
330
|
+
snapshot.staleOutputs = [...new Set([...(snapshot.staleOutputs ?? []), output])];
|
|
331
|
+
}
|
|
332
|
+
function markOutputFresh(snapshot, output) {
|
|
333
|
+
const remaining = (snapshot.staleOutputs ?? []).filter(candidate => candidate !== output);
|
|
334
|
+
if (remaining.length > 0)
|
|
335
|
+
snapshot.staleOutputs = remaining;
|
|
336
|
+
else
|
|
337
|
+
delete snapshot.staleOutputs;
|
|
338
|
+
}
|
|
339
|
+
function validateAttachments(inputs) {
|
|
340
|
+
if (!Array.isArray(inputs))
|
|
341
|
+
throw MarifoldError_1.MarifoldError.appInvalid('SkillApp attachments must be an array.');
|
|
342
|
+
if (inputs.length > 16)
|
|
343
|
+
throw MarifoldError_1.MarifoldError.appInvalid('SkillApp attachments are limited to 16 files.');
|
|
344
|
+
let total = 0;
|
|
345
|
+
let images = 0;
|
|
346
|
+
return inputs.map((input, index) => {
|
|
347
|
+
if (!input || typeof input !== 'object') {
|
|
348
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment #${index + 1} must be an object.`);
|
|
349
|
+
}
|
|
350
|
+
const name = path.basename(input.name ?? '').replace(/[\u0000-\u001f\u007f]/g, '').trim();
|
|
351
|
+
if (!name || name === '.' || name === '..') {
|
|
352
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment #${index + 1} needs a valid filename.`);
|
|
353
|
+
}
|
|
354
|
+
if (input.kind !== 'image' && input.kind !== 'file') {
|
|
355
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment '${name}' has an invalid kind.`);
|
|
356
|
+
}
|
|
357
|
+
if (!input.mediaType || typeof input.mediaType !== 'string') {
|
|
358
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment '${name}' needs a media type.`);
|
|
359
|
+
}
|
|
360
|
+
if (input.kind === 'image') {
|
|
361
|
+
images += 1;
|
|
362
|
+
if (images > ImageOptimizer_1.MAX_IMAGES_PER_REQUEST) {
|
|
363
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachments are limited to ${ImageOptimizer_1.MAX_IMAGES_PER_REQUEST} images.`);
|
|
364
|
+
}
|
|
365
|
+
if (!input.mediaType.startsWith('image/')) {
|
|
366
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp image '${name}' needs an image media type.`);
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
if (typeof input.data !== 'string' || !/^[A-Za-z0-9+/]*={0,2}$/.test(input.data) || input.data.length % 4 === 1) {
|
|
370
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment '${name}' must contain base64 data.`);
|
|
371
|
+
}
|
|
372
|
+
const size = Buffer.from(input.data, 'base64').length;
|
|
373
|
+
if (size === 0 || size !== input.size) {
|
|
374
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment '${name}' has invalid size metadata.`);
|
|
375
|
+
}
|
|
376
|
+
total += size;
|
|
377
|
+
if (total > RunWorkspace_1.MAX_RUN_INPUT_BYTES) {
|
|
378
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachments exceed ${RunWorkspace_1.MAX_RUN_INPUT_BYTES / (1024 * 1024)} MiB.`);
|
|
379
|
+
}
|
|
380
|
+
if (input.inspectionText !== undefined
|
|
381
|
+
&& (typeof input.inspectionText !== 'string'
|
|
382
|
+
|| Buffer.byteLength(input.inspectionText, 'utf8') > RunWorkspace_1.MAX_RUN_INSPECTION_TEXT_BYTES)) {
|
|
383
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp attachment '${name}' inspection text exceeds ${RunWorkspace_1.MAX_RUN_INSPECTION_TEXT_BYTES / 1024} KiB.`);
|
|
384
|
+
}
|
|
385
|
+
return {
|
|
386
|
+
kind: input.kind,
|
|
387
|
+
name,
|
|
388
|
+
mediaType: input.mediaType,
|
|
389
|
+
size,
|
|
390
|
+
data: input.data,
|
|
391
|
+
...(input.inspectionText !== undefined ? { inspectionText: input.inspectionText } : {}),
|
|
392
|
+
};
|
|
393
|
+
});
|
|
214
394
|
}
|
|
215
395
|
function operationIsRunnable(requiredInputs, state) {
|
|
216
396
|
return requiredInputs.every(name => (state[name] ?? '').trim().length > 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkillAppInstanceRegistry.js","sourceRoot":"","sources":["../../src/app/SkillAppInstanceRegistry.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,2DAAwD;AAUxD,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,6BAA6B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AA0BrD,gFAAgF;AAChF;IAIqB,OAAO;IACP,YAAY;IACZ,WAAW;IALb,SAAS,GAAG,IAAI,GAAG,EAA0B,CAAC;IAE/D,YACmB,OAAgC,EAChC,YAAY,GAAG,qBAAqB,EACpC,WAAW,GAAG,6BAA6B;uBAF3C,OAAO;4BACP,YAAY;2BACZ,WAAW;IAC3B,CAAC;IAEJ,MAAM,CAAC,OAAe;QACpB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7C,MAAM,6BAAa,CAAC,UAAU,CAAC,6CAA6C,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QACrG,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU;YAAE,MAAM,6BAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,EAAE,GAAG,OAAO,IAAA,mBAAU,GAAE,EAAE,CAAC;QACjC,MAAM,QAAQ,GAA6B;YACzC,EAAE;YACF,OAAO;YACP,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SACpF,CAAC;QACF,MAAM,MAAM,GAAmB,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;QAC/E,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAC,UAAkB;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,MAAM,CACV,UAAkB,EAClB,MAA+B;QAE/B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9F,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,MAAM,6BAAa,CAAC,UAAU,CAAC,oCAAoC,IAAI,IAAI,CAAC,CAAC;YACzG,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,MAAM,6BAAa,CAAC,UAAU,CAAC,mBAAmB,IAAI,iBAAiB,CAAC,CAAC;YACrG,IAAI,OAAO,QAAQ,KAAK,QAAQ;gBAAE,MAAM,6BAAa,CAAC,UAAU,CAAC,mBAAmB,IAAI,qBAAqB,CAAC,CAAC;YAC/G,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAA4B,EAAE,CAAC;YACjF,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ;gBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACzC,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9F,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAC3D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CACxE,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;eAC1D,CAAC,mBAAmB,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5E,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;YAC1C,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAC7C,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACjD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,SAAS,CAAE,CAAC;YACxG,OAAO,mBAAmB,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QACH,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO;gBACL,MAAM,EAAE,MAAM;gBACd,GAAG,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,wBAAiC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtF,GAAG,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpF,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;aACzC,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACnG,MAAM,SAAS,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC;QACvF,MAAM,QAAQ,GAAG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC1D,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;YACxC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,UAAkB,EAAE,aAAqB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;QACnG,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,6BAAa,CAAC,UAAU,CAAC,aAAa,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,uBAAuB,aAAa,IAAI,CAAC,CAAC;QAClH,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAC7C,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAC5C,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,wBAAwB;gBAChC,SAAS,EAAE,aAAa;gBACxB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,UAAkB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,IAAI,MAAM,CAAC,WAAW;YAAE,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACzD,KAAK,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACxD,IAAI,MAAM,CAAC,KAAK;gBAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;YAC3B,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjH,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,KAAK,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEO,QAAQ,CAAC,MAAsB,EAAE,OAAkC;QACzE,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzE,CAAC;IAEO,aAAa,CACnB,MAAsB,EACtB,aAAqB,EACrB,OAAe;QAEf,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,UAAU,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,QAAQ,EAAE,KAAK;YAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClD,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAC9B,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAElH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,MAAM,GAAoB,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;YACxD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,KAAK,GAAG,GAAG,EAAE;gBACjB,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;gBACzB,MAAM,CAAC,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAC3C,KAAK,IAAI,CAAC,OAAO,CAAC,oBAAoB,CACpC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAC1B,aAAa,EACb,KAAK,EACL,MAAM,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACd,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,UAAU,KAAK,UAAU;wBAAE,OAAO;oBAC5E,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;wBAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,aAAa,CAAE,CAAC;wBACpG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC7D,CAAC;oBACD,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBACxC,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC/G,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBACf,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,UAAU,KAAK,UAAU;wBAAE,OAAO;oBAC5E,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBACxC,IAAI,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;wBACtC,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;wBACtG,OAAO;oBACT,CAAC;oBACD,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YACF,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBAChB,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC1C,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,KAAK,EAAE,CAAC;YACV,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,MAAsB,EAAE,aAAqB;QACnE,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,MAAM,CAAC,KAAK;YAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;QAC3B,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACxC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjH,CAAC;IAEO,OAAO,CAAC,UAAkB;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM;YAAE,MAAM,6BAAa,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,aAAa,CAAC,MAAsB;QAC1C,IAAI,MAAM,CAAC,WAAW;YAAE,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzF,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;IAC/B,CAAC;CACF;;AAED,SAAS,mBAAmB,CAAC,UAA8B,EAAE,SAAiB,EAAE,KAAa;IAC3F,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5C,MAAM,6BAAa,CAAC,UAAU,CAAC,mBAAmB,SAAS,qBAAqB,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,KAAmC;IAClD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,aAAa,CAAC,QAAkC;IACvD,OAAO,EAAE,GAAG,QAAQ,EAAE,KAAK,EAAE,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,mBAAmB,CAC1B,cAAwB,EACxB,KAAyC;IAEzC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC7E,CAAC"}
|
|
1
|
+
{"version":3,"file":"SkillAppInstanceRegistry.js","sourceRoot":"","sources":["../../src/app/SkillAppInstanceRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import type { ResolvedSkillInvocation } from '../skill/SkillInvocation';
|
|
2
2
|
import type { AppStore } from './AppStore';
|
|
3
|
-
import type { SkillAppDefinition, SkillAppModelDefinition, SkillAppSkillDefinition, SkillAppStateValue } from './SkillAppSchema';
|
|
3
|
+
import type { SkillAppDefinition, SkillAppModelDefinition, SkillAppProfileDefinition, SkillAppSkillDefinition, SkillAppStateValue } from './SkillAppSchema';
|
|
4
4
|
export interface ResolvedSkillAppOperation extends ResolvedSkillInvocation {
|
|
5
5
|
appName: string;
|
|
6
6
|
operationName: string;
|
|
7
7
|
output: string;
|
|
8
|
-
model
|
|
8
|
+
model?: SkillAppModelDefinition;
|
|
9
|
+
profile?: SkillAppProfileDefinition;
|
|
9
10
|
result: SkillAppSkillDefinition['result'];
|
|
11
|
+
/** Exact selected Skill folder mounted read-only for profile Agent runs. */
|
|
12
|
+
skillDirectory?: string;
|
|
10
13
|
}
|
|
11
14
|
export declare function resolveSkillAppOperation(store: AppStore, definition: SkillAppDefinition, operationName: string, state: Record<string, SkillAppStateValue>): ResolvedSkillAppOperation;
|
|
12
15
|
//# sourceMappingURL=SkillAppResolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkillAppResolver.d.ts","sourceRoot":"","sources":["../../src/app/SkillAppResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SkillAppResolver.d.ts","sourceRoot":"","sources":["../../src/app/SkillAppResolver.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAGxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EAEvB,yBAAyB,EACzB,uBAAuB,EACvB,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,yBAA0B,SAAQ,uBAAuB;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,uBAAuB,CAAC;IAChC,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC1C,4EAA4E;IAC5E,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,QAAQ,EACf,UAAU,EAAE,kBAAkB,EAC9B,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GACxC,yBAAyB,CAuF3B"}
|
|
@@ -35,20 +35,44 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.resolveSkillAppOperation = resolveSkillAppOperation;
|
|
37
37
|
const fs = __importStar(require("fs"));
|
|
38
|
+
const path = __importStar(require("path"));
|
|
38
39
|
const MarifoldError_1 = require("../errors/MarifoldError");
|
|
39
40
|
const SkillInvocation_1 = require("../skill/SkillInvocation");
|
|
40
41
|
const SkillValidator_1 = require("../skill/SkillValidator");
|
|
41
42
|
function resolveSkillAppOperation(store, definition, operationName, state) {
|
|
42
43
|
const operation = requireOperation(definition, operationName);
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
let model;
|
|
45
|
+
let profile;
|
|
46
|
+
let skill;
|
|
47
|
+
let result;
|
|
48
|
+
let source;
|
|
49
|
+
let selectedSkillName;
|
|
50
|
+
if (operation.profile) {
|
|
51
|
+
profile = (definition.profiles ?? []).find(candidate => candidate.name === operation.profile);
|
|
52
|
+
if (!profile || !operation.result) {
|
|
53
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' has an invalid profile or result reference.`);
|
|
54
|
+
}
|
|
55
|
+
selectedSkillName = resolveProfileSkillName(operation, state);
|
|
56
|
+
skill = store.requireProfileSkill(profile.profile, selectedSkillName);
|
|
57
|
+
source = skill.source;
|
|
58
|
+
result = operation.result;
|
|
47
59
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
60
|
+
else {
|
|
61
|
+
if (!operation.skill) {
|
|
62
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' has no app-local Skill reference.`);
|
|
63
|
+
}
|
|
64
|
+
selectedSkillName = operation.skill;
|
|
65
|
+
model = definition.models.find(candidate => candidate.name === operation.model);
|
|
66
|
+
const registeredSkill = definition.skills.find(candidate => candidate.name === selectedSkillName);
|
|
67
|
+
if (!model || !registeredSkill) {
|
|
68
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' has an invalid model or Skill reference.`);
|
|
69
|
+
}
|
|
70
|
+
source = store.requireLocalSkillSource(definition.app.name, registeredSkill.name);
|
|
71
|
+
skill = (0, SkillValidator_1.parseSkill)(fs.readFileSync(source, 'utf-8'), source);
|
|
72
|
+
if (skill.name !== registeredSkill.name) {
|
|
73
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`App-local Skill folder '${registeredSkill.name}' contains Skill '${skill.name}'. Names must match.`, source);
|
|
74
|
+
}
|
|
75
|
+
result = registeredSkill.result;
|
|
52
76
|
}
|
|
53
77
|
const parameters = {};
|
|
54
78
|
for (const [parameter, stateName] of Object.entries(operation.parameters)) {
|
|
@@ -60,25 +84,52 @@ function resolveSkillAppOperation(store, definition, operationName, state) {
|
|
|
60
84
|
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' supplies unknown Skill parameter(s): ${unknown.join(', ')}.`, source);
|
|
61
85
|
}
|
|
62
86
|
const userTurn = `App · ${definition.app.title} · ${operationName}`;
|
|
63
|
-
const
|
|
87
|
+
const rawPrompt = operation.input === undefined ? undefined : (state[operation.input] ?? '');
|
|
88
|
+
const prompt = rawPrompt !== undefined && operation.stripSkillName
|
|
89
|
+
? stripLeadingSkillName(rawPrompt, operation.skillOptions ?? [selectedSkillName])
|
|
90
|
+
: rawPrompt;
|
|
91
|
+
if (operation.input !== undefined && prompt !== undefined && prompt.trim().length === 0) {
|
|
92
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' requires input beyond the selected Skill name.`);
|
|
93
|
+
}
|
|
94
|
+
const resolved = (0, SkillInvocation_1.resolveSkillValuesInvocation)(skill, parameters, userTurn, prompt);
|
|
64
95
|
if (resolved.missing.length > 0) {
|
|
65
96
|
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' is missing required Skill values: ${resolved.missing.join(', ')}.`, source);
|
|
66
97
|
}
|
|
67
|
-
if (resolved.mode && resolved.mode !== 'chat') {
|
|
98
|
+
if (!profile && resolved.mode && resolved.mode !== 'chat') {
|
|
68
99
|
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp v1 only supports chat-mode Skills; '${skill.name}' uses '${resolved.mode}'.`, source);
|
|
69
100
|
}
|
|
70
101
|
return {
|
|
71
102
|
...resolved,
|
|
72
|
-
// v1
|
|
73
|
-
//
|
|
74
|
-
|
|
103
|
+
// v1 app-local runs remain tool-free. Profile-backed runs preserve the
|
|
104
|
+
// ordinary invocation's exact bundled-file instruction for narrow
|
|
105
|
+
// read-only access through the profile Skill runtime.
|
|
106
|
+
instructions: profile ? resolved.instructions : [resolved.instructions[0]],
|
|
75
107
|
appName: definition.app.name,
|
|
76
108
|
operationName,
|
|
77
109
|
output: operation.output,
|
|
78
|
-
model,
|
|
79
|
-
|
|
110
|
+
...(model ? { model } : {}),
|
|
111
|
+
...(profile ? { profile } : {}),
|
|
112
|
+
...(profile && source ? { skillDirectory: path.dirname(source) } : {}),
|
|
113
|
+
result,
|
|
80
114
|
};
|
|
81
115
|
}
|
|
116
|
+
function resolveProfileSkillName(operation, state) {
|
|
117
|
+
if (operation.skill)
|
|
118
|
+
return operation.skill;
|
|
119
|
+
const selected = operation.skillState ? state[operation.skillState] ?? '' : '';
|
|
120
|
+
if (!selected || !operation.skillOptions?.includes(selected)) {
|
|
121
|
+
throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operation.name}' selected a profile Skill outside its static allowlist.`);
|
|
122
|
+
}
|
|
123
|
+
return selected;
|
|
124
|
+
}
|
|
125
|
+
function stripLeadingSkillName(input, skills) {
|
|
126
|
+
const escaped = [...skills]
|
|
127
|
+
.sort((left, right) => right.length - left.length)
|
|
128
|
+
.map(skill => skill.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
|
|
129
|
+
if (escaped.length === 0)
|
|
130
|
+
return input;
|
|
131
|
+
return input.replace(new RegExp(`^\\s*\\$?(?:${escaped.join('|')})(?=\\s|:|$)\\s*:?\\s*`, 'i'), '');
|
|
132
|
+
}
|
|
82
133
|
function requireOperation(definition, operationName) {
|
|
83
134
|
const operation = definition.operations.find(candidate => candidate.name === operationName);
|
|
84
135
|
if (!operation) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SkillAppResolver.js","sourceRoot":"","sources":["../../src/app/SkillAppResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,EAAE,+BAAW;AACzB,2DAAwD;AACxD,8DAAwE;AAExE,4DAAqD;
|
|
1
|
+
{"version":3,"file":"SkillAppResolver.js","sourceRoot":"","sources":["../../src/app/SkillAppResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,EAAE,+BAAW;AACzB,MAAY,IAAI,iCAAa;AAC7B,2DAAwD;AACxD,8DAAwE;AAExE,4DAAqD;AAuBrD,kCACE,KAAe,EACf,UAA8B,EAC9B,aAAqB,EACrB,KAAyC;IAEzC,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAC9D,IAAI,KAA0C,CAAC;IAC/C,IAAI,OAA8C,CAAC;IACnD,IAAI,KAAoB,CAAC;IACzB,IAAI,MAAyC,CAAC;IAC9C,IAAI,MAA0B,CAAC;IAC/B,IAAI,iBAAyB,CAAC;IAC9B,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,GAAG,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9F,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAClC,MAAM,6BAAa,CAAC,UAAU,CAAC,uBAAuB,aAAa,+CAA+C,CAAC,CAAC;QACtH,CAAC;QACD,iBAAiB,GAAG,uBAAuB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC9D,KAAK,GAAG,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACtE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QACtB,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,6BAAa,CAAC,UAAU,CAAC,uBAAuB,aAAa,qCAAqC,CAAC,CAAC;QAC5G,CAAC;QACD,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC;QACpC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,CAAC,CAAC;QAChF,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;QAClG,IAAI,CAAC,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;YAC/B,MAAM,6BAAa,CAAC,UAAU,CAAC,uBAAuB,aAAa,4CAA4C,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,uBAAuB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAClF,KAAK,GAAG,IAAA,2BAAU,EAAC,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7D,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,EAAE,CAAC;YACxC,MAAM,6BAAa,CAAC,UAAU,CAC5B,2BAA2B,eAAe,CAAC,IAAI,qBAAqB,KAAK,CAAC,IAAI,sBAAsB,EACpG,MAAM,CACP,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,KAAK,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1E,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,6BAAa,CAAC,UAAU,CAC5B,uBAAuB,aAAa,0CAA0C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EACnG,MAAM,CACP,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,SAAS,UAAU,CAAC,GAAG,CAAC,KAAK,MAAM,aAAa,EAAE,CAAC;IACpE,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7F,MAAM,MAAM,GAAG,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,cAAc;QAChE,CAAC,CAAC,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,YAAY,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACjF,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxF,MAAM,6BAAa,CAAC,UAAU,CAC5B,uBAAuB,aAAa,kDAAkD,CACvF,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,IAAA,8CAA4B,EAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnF,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,6BAAa,CAAC,UAAU,CAC5B,uBAAuB,aAAa,uCAAuC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EACzG,MAAM,CACP,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1D,MAAM,6BAAa,CAAC,UAAU,CAC5B,gDAAgD,KAAK,CAAC,IAAI,WAAW,QAAQ,CAAC,IAAI,IAAI,EACtF,MAAM,CACP,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,QAAQ;QACX,uEAAuE;QACvE,kEAAkE;QAClE,sDAAsD;QACtD,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC1E,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI;QAC5B,aAAa;QACb,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM;KACP,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,SAAsC,EACtC,KAAyC;IAEzC,IAAI,SAAS,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC,KAAK,CAAC;IAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7D,MAAM,6BAAa,CAAC,UAAU,CAC5B,uBAAuB,SAAS,CAAC,IAAI,0DAA0D,CAChG,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAa,EAAE,MAAgB;IAC5D,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC;SACxB,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACjD,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvC,OAAO,KAAK,CAAC,OAAO,CAClB,IAAI,MAAM,CAAC,eAAe,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,CAAC,EACzE,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,UAA8B,EAC9B,aAAqB;IAErB,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IAC5F,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,6BAAa,CAAC,UAAU,CAC5B,aAAa,UAAU,CAAC,GAAG,CAAC,IAAI,6BAA6B,aAAa,IAAI,CAC/E,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|