@sulala/agent 0.1.13 → 0.1.14
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 +3 -3
- package/dashboard/dist/assets/index-DegBJNv6.css +1 -0
- package/dashboard/dist/assets/index-pVHpAj3h.js +83 -0
- package/dashboard/dist/index.html +2 -2
- package/dist/agent/loop.d.ts.map +1 -1
- package/dist/agent/loop.js +21 -6
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/skill-generate.d.ts +1 -1
- package/dist/agent/skill-generate.d.ts.map +1 -1
- package/dist/agent/skill-generate.js +10 -3
- package/dist/agent/skill-generate.js.map +1 -1
- package/dist/agent/skill-install.d.ts +12 -1
- package/dist/agent/skill-install.d.ts.map +1 -1
- package/dist/agent/skill-install.js +130 -15
- package/dist/agent/skill-install.js.map +1 -1
- package/dist/agent/skills.d.ts +4 -3
- package/dist/agent/skills.d.ts.map +1 -1
- package/dist/agent/skills.js +53 -25
- package/dist/agent/skills.js.map +1 -1
- package/dist/agent/tool/spec-loader.d.ts +7 -0
- package/dist/agent/tool/spec-loader.d.ts.map +1 -0
- package/dist/agent/tool/spec-loader.js +540 -0
- package/dist/agent/tool/spec-loader.js.map +1 -0
- package/dist/agent/tools.d.ts.map +1 -1
- package/dist/agent/tools.integrations.test.js +4 -5
- package/dist/agent/tools.integrations.test.js.map +1 -1
- package/dist/agent/tools.js +144 -367
- package/dist/agent/tools.js.map +1 -1
- package/dist/ai/orchestrator.d.ts.map +1 -1
- package/dist/ai/orchestrator.js +82 -17
- package/dist/ai/orchestrator.js.map +1 -1
- package/dist/cli.d.ts +4 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +16 -8
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +20 -5
- package/dist/config.js.map +1 -1
- package/dist/db/index.d.ts +14 -7
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +108 -30
- package/dist/db/index.js.map +1 -1
- package/dist/gateway/server.d.ts.map +1 -1
- package/dist/gateway/server.js +141 -15
- package/dist/gateway/server.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/onboard-env.d.ts +1 -1
- package/dist/onboard-env.d.ts.map +1 -1
- package/dist/onboard-env.js +2 -0
- package/dist/onboard-env.js.map +1 -1
- package/dist/types.d.ts +5 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/watcher/index.d.ts.map +1 -1
- package/dist/watcher/index.js +1 -2
- package/dist/watcher/index.js.map +1 -1
- package/package.json +4 -5
- package/src/index.ts +1 -1
- package/context/00-rules.md +0 -1
- package/context/airtable.md +0 -35
- package/context/apple-notes.md +0 -99
- package/context/asana.md +0 -37
- package/context/bluesky.md +0 -46
- package/context/calendar.md +0 -63
- package/context/country-info.md +0 -13
- package/context/create-skill.md +0 -128
- package/context/discord.md +0 -30
- package/context/docs.md +0 -29
- package/context/drive.md +0 -49
- package/context/dropbox.md +0 -39
- package/context/facebook.md +0 -47
- package/context/fetch-form-api.md +0 -16
- package/context/figma.md +0 -30
- package/context/files.md +0 -30
- package/context/git.md +0 -37
- package/context/github.md +0 -58
- package/context/gmail.md +0 -52
- package/context/google.md +0 -28
- package/context/hellohub.md +0 -29
- package/context/jira.md +0 -46
- package/context/linear.md +0 -40
- package/context/news.md +0 -64
- package/context/notion.md +0 -45
- package/context/portal-integrations.md +0 -42
- package/context/post-to-x.md +0 -50
- package/context/sheets.md +0 -47
- package/context/slack.md +0 -48
- package/context/slides.md +0 -35
- package/context/stripe.md +0 -38
- package/context/tes.md +0 -7
- package/context/test.md +0 -7
- package/context/weather.md +0 -32
- package/context/zoom.md +0 -28
- package/dashboard/dist/assets/index-BTx-9jCj.css +0 -1
- package/dashboard/dist/assets/index-B_QGQ8c_.js +0 -83
- package/registry/apple-notes.md +0 -99
- package/registry/bluesky.md +0 -34
- package/registry/files.md +0 -30
- package/registry/git.md +0 -37
- package/registry/news.md +0 -64
- package/registry/skills-registry.json +0 -46
- package/registry/weather.md +0 -32
|
@@ -0,0 +1,540 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Loads tool definitions from context/<name>/tools.yaml and registers them with a generic executor.
|
|
3
|
+
* Auth is driven by a registry (add one entry per auth method); YAML references auth by key.
|
|
4
|
+
*/
|
|
5
|
+
import { readFileSync, existsSync, readdirSync, statSync } from 'fs';
|
|
6
|
+
import { join, resolve, basename } from 'path';
|
|
7
|
+
import { parse as parseYaml } from 'yaml';
|
|
8
|
+
import { getEffectiveStripeSecretKey } from '../../channels/stripe.js';
|
|
9
|
+
import { getEffectiveDiscordBotToken } from '../../channels/discord.js';
|
|
10
|
+
import { getPortalGatewayBase, getEffectivePortalApiKey } from '../../config.js';
|
|
11
|
+
const AUTH_REGISTRY = {
|
|
12
|
+
none: {
|
|
13
|
+
getCredentials: () => ({ headers: {} }),
|
|
14
|
+
notConfiguredMessage: '',
|
|
15
|
+
},
|
|
16
|
+
stripe_secret_key: {
|
|
17
|
+
getCredentials: () => {
|
|
18
|
+
const key = getEffectiveStripeSecretKey();
|
|
19
|
+
return key?.trim() ? { headers: { Authorization: `Bearer ${key}` } } : null;
|
|
20
|
+
},
|
|
21
|
+
notConfiguredMessage: 'Stripe is not configured. Add a secret key in Settings → Payment or set STRIPE_SECRET_KEY.',
|
|
22
|
+
label: 'Stripe',
|
|
23
|
+
invalidKeyMessage: 'Invalid Stripe secret key (unauthorized)',
|
|
24
|
+
},
|
|
25
|
+
discord_bot_token: {
|
|
26
|
+
getCredentials: () => {
|
|
27
|
+
const token = getEffectiveDiscordBotToken();
|
|
28
|
+
return token?.trim() ? { headers: { Authorization: `Bot ${token}` } } : null;
|
|
29
|
+
},
|
|
30
|
+
notConfiguredMessage: 'Discord is not configured. Add a bot token in Settings → Channels (Discord) or set DISCORD_BOT_TOKEN.',
|
|
31
|
+
label: 'Discord',
|
|
32
|
+
},
|
|
33
|
+
portal: {
|
|
34
|
+
getCredentials: () => {
|
|
35
|
+
const base = getPortalGatewayBase();
|
|
36
|
+
const key = getEffectivePortalApiKey();
|
|
37
|
+
if (!base?.trim() || !key?.trim())
|
|
38
|
+
return null;
|
|
39
|
+
return { headers: { Authorization: `Bearer ${key}` }, baseUrl: base.replace(/\/$/, '') };
|
|
40
|
+
},
|
|
41
|
+
notConfiguredMessage: 'Set PORTAL_GATEWAY_URL and PORTAL_API_KEY (from Portal → API Keys)',
|
|
42
|
+
},
|
|
43
|
+
};
|
|
44
|
+
/** Whether an error looks like an API key / auth problem (401 or message text). */
|
|
45
|
+
function isApiKeyRelatedError(status, errMsg) {
|
|
46
|
+
if (status === 401)
|
|
47
|
+
return true;
|
|
48
|
+
if (!errMsg || typeof errMsg !== 'string')
|
|
49
|
+
return false;
|
|
50
|
+
const lower = errMsg.toLowerCase();
|
|
51
|
+
return (/invalid|incorrect|missing|unauthorized|expired|invalid key|api key|api_key|authentication failed/i.test(lower));
|
|
52
|
+
}
|
|
53
|
+
/** Append instruction to add or fix API key in the Skills page. */
|
|
54
|
+
function withSkillPageHint(message, skillSlug) {
|
|
55
|
+
const hint = skillSlug
|
|
56
|
+
? ` Add or update the API key in the Skills page (Dashboard → Skills → ${skillSlug}).`
|
|
57
|
+
: ` Add or update the API key in the Skills page (Dashboard → Skills).`;
|
|
58
|
+
return message + hint;
|
|
59
|
+
}
|
|
60
|
+
function getAuth(authType) {
|
|
61
|
+
const key = (authType ?? 'none').trim() || 'none';
|
|
62
|
+
const entry = AUTH_REGISTRY[key];
|
|
63
|
+
if (!entry)
|
|
64
|
+
return { error: `Unknown auth type: ${authType ?? 'undefined'}` };
|
|
65
|
+
const creds = entry.getCredentials();
|
|
66
|
+
if (!creds)
|
|
67
|
+
return { error: entry.notConfiguredMessage };
|
|
68
|
+
return {
|
|
69
|
+
...creds,
|
|
70
|
+
label: entry.label,
|
|
71
|
+
invalidKeyMessage: entry.invalidKeyMessage,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
function buildUrl(urlTemplate, args) {
|
|
75
|
+
let url = urlTemplate;
|
|
76
|
+
const re = /\{\{(\w+)\}\}/g;
|
|
77
|
+
let m;
|
|
78
|
+
while ((m = re.exec(urlTemplate)) !== null) {
|
|
79
|
+
const key = m[1];
|
|
80
|
+
const val = args[key];
|
|
81
|
+
const str = typeof val === 'string' ? val.trim() : val != null ? String(val) : '';
|
|
82
|
+
url = url.replace(new RegExp(`\\{\\{${key}\\}\\}`, 'g'), encodeURIComponent(str));
|
|
83
|
+
}
|
|
84
|
+
return url;
|
|
85
|
+
}
|
|
86
|
+
function applyQueryParams(urlStr, queryParams, args) {
|
|
87
|
+
if (!queryParams || Object.keys(queryParams).length === 0)
|
|
88
|
+
return urlStr;
|
|
89
|
+
const url = new URL(urlStr);
|
|
90
|
+
for (const [paramName, argName] of Object.entries(queryParams)) {
|
|
91
|
+
const val = args[argName];
|
|
92
|
+
if (val === undefined || val === null || val === '')
|
|
93
|
+
continue;
|
|
94
|
+
url.searchParams.set(paramName, typeof val === 'number' ? String(val) : String(val).trim());
|
|
95
|
+
}
|
|
96
|
+
return url.toString();
|
|
97
|
+
}
|
|
98
|
+
function specToParameters(spec) {
|
|
99
|
+
const properties = {};
|
|
100
|
+
const required = [];
|
|
101
|
+
for (const p of spec.parameters ?? []) {
|
|
102
|
+
properties[p.name] = {
|
|
103
|
+
type: p.type === 'number' ? 'number' : 'string',
|
|
104
|
+
description: p.description,
|
|
105
|
+
};
|
|
106
|
+
if (p.required)
|
|
107
|
+
required.push(p.name);
|
|
108
|
+
}
|
|
109
|
+
return {
|
|
110
|
+
type: 'object',
|
|
111
|
+
properties: Object.keys(properties).length ? properties : {},
|
|
112
|
+
required,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
function applyDefaults(args, spec) {
|
|
116
|
+
const out = { ...args };
|
|
117
|
+
for (const p of spec.parameters ?? []) {
|
|
118
|
+
if (p.default !== undefined && (out[p.name] === undefined || out[p.name] === null)) {
|
|
119
|
+
out[p.name] = p.default;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return out;
|
|
123
|
+
}
|
|
124
|
+
function clampLimit(value, defaultVal, max) {
|
|
125
|
+
if (typeof value !== 'number' || !Number.isFinite(value))
|
|
126
|
+
return defaultVal;
|
|
127
|
+
return Math.min(Math.max(1, Math.floor(value)), max);
|
|
128
|
+
}
|
|
129
|
+
function normalizeList(data, listPath, rootIsArray, itemKeys) {
|
|
130
|
+
let arr;
|
|
131
|
+
if (rootIsArray && Array.isArray(data)) {
|
|
132
|
+
arr = data;
|
|
133
|
+
}
|
|
134
|
+
else if (listPath && typeof data === 'object' && data !== null && listPath in data) {
|
|
135
|
+
const v = data[listPath];
|
|
136
|
+
arr = Array.isArray(v) ? v : [];
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
return [];
|
|
140
|
+
}
|
|
141
|
+
if (!itemKeys?.length)
|
|
142
|
+
return arr;
|
|
143
|
+
return arr.map((item) => {
|
|
144
|
+
if (typeof item !== 'object' || item === null)
|
|
145
|
+
return item;
|
|
146
|
+
const o = item;
|
|
147
|
+
const out = {};
|
|
148
|
+
for (const k of itemKeys) {
|
|
149
|
+
if (k in o)
|
|
150
|
+
out[k] = o[k];
|
|
151
|
+
}
|
|
152
|
+
return out;
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
function normalizeSingle(data, singleKeys) {
|
|
156
|
+
if (typeof data !== 'object' || data === null)
|
|
157
|
+
return {};
|
|
158
|
+
const o = data;
|
|
159
|
+
if (!singleKeys?.length)
|
|
160
|
+
return o;
|
|
161
|
+
const out = {};
|
|
162
|
+
for (const k of singleKeys) {
|
|
163
|
+
if (k in o)
|
|
164
|
+
out[k] = o[k];
|
|
165
|
+
}
|
|
166
|
+
return out;
|
|
167
|
+
}
|
|
168
|
+
/** Get value from object by path "step0.id" or "step0". */
|
|
169
|
+
function getPath(obj, path) {
|
|
170
|
+
const parts = path.split('.');
|
|
171
|
+
let cur = obj;
|
|
172
|
+
for (const p of parts) {
|
|
173
|
+
if (cur == null || typeof cur !== 'object')
|
|
174
|
+
return undefined;
|
|
175
|
+
cur = cur[p];
|
|
176
|
+
}
|
|
177
|
+
return cur;
|
|
178
|
+
}
|
|
179
|
+
/** Replace {{x}}, {{step0.id}}, {{$now}} in string. scope = args + optional base; stepContext = { step0, step1, ... }. */
|
|
180
|
+
function interpolate(str, scope, stepContext) {
|
|
181
|
+
return str.replace(/\{\{(\$now|[^}]+)\}\}/g, (_, key) => {
|
|
182
|
+
const k = key.trim();
|
|
183
|
+
if (k === '$now')
|
|
184
|
+
return new Date().toISOString().replace(/\.\d{3}Z$/, '.000Z');
|
|
185
|
+
if (k.startsWith('step') && k.includes('.')) {
|
|
186
|
+
const val = getPath(stepContext, k);
|
|
187
|
+
return val != null ? String(val) : '';
|
|
188
|
+
}
|
|
189
|
+
if (k.startsWith('step') && k in stepContext)
|
|
190
|
+
return String(stepContext[k] ?? '');
|
|
191
|
+
return String(scope[k] ?? '');
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
/** Recursively replace {{...}} placeholders in object/array/string. */
|
|
195
|
+
function interpolateDeep(val, scope, stepContext) {
|
|
196
|
+
if (typeof val === 'string')
|
|
197
|
+
return interpolate(val, scope, stepContext);
|
|
198
|
+
if (Array.isArray(val))
|
|
199
|
+
return val.map((v) => interpolateDeep(v, scope, stepContext));
|
|
200
|
+
if (val && typeof val === 'object') {
|
|
201
|
+
const out = {};
|
|
202
|
+
for (const [k, v] of Object.entries(val))
|
|
203
|
+
out[k] = interpolateDeep(v, scope, stepContext);
|
|
204
|
+
return out;
|
|
205
|
+
}
|
|
206
|
+
return val;
|
|
207
|
+
}
|
|
208
|
+
/** Apply transformArgs: e.g. amount_cents = amount_dollars * 100 when amount_cents missing. */
|
|
209
|
+
function applyTransformArgs(args, transformArgs) {
|
|
210
|
+
if (!transformArgs || Object.keys(transformArgs).length === 0)
|
|
211
|
+
return args;
|
|
212
|
+
const out = { ...args };
|
|
213
|
+
for (const [target, expr] of Object.entries(transformArgs)) {
|
|
214
|
+
if (out[target] !== undefined && out[target] !== null)
|
|
215
|
+
continue;
|
|
216
|
+
if (expr === 'amount_dollars * 100') {
|
|
217
|
+
const d = Number(out.amount_dollars);
|
|
218
|
+
if (Number.isFinite(d))
|
|
219
|
+
out[target] = Math.round(d * 100);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
return out;
|
|
223
|
+
}
|
|
224
|
+
async function executeSteps(spec, args, skillSlug) {
|
|
225
|
+
for (const p of spec.parameters ?? []) {
|
|
226
|
+
if (p.required) {
|
|
227
|
+
const val = args[p.name];
|
|
228
|
+
if (val === undefined || val === null || (typeof val === 'string' && !val.trim())) {
|
|
229
|
+
return { error: `${p.name} is required` };
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
const auth = getAuth(spec.auth);
|
|
234
|
+
if ('error' in auth)
|
|
235
|
+
return { error: auth.error };
|
|
236
|
+
let scope = applyDefaults(args, spec);
|
|
237
|
+
scope = applyTransformArgs(scope, spec.transformArgs);
|
|
238
|
+
if (auth.baseUrl)
|
|
239
|
+
scope = { ...scope, base: auth.baseUrl };
|
|
240
|
+
const stepContext = {};
|
|
241
|
+
const headers = { ...auth.headers };
|
|
242
|
+
let lastResponse = null;
|
|
243
|
+
for (let i = 0; i < (spec.steps ?? []).length; i++) {
|
|
244
|
+
const step = spec.steps[i];
|
|
245
|
+
if (step.when) {
|
|
246
|
+
const v = scope[step.when];
|
|
247
|
+
if (v === false || v === 'false' || v === '' || v == null)
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
const url = interpolate(step.url, scope, stepContext);
|
|
251
|
+
const init = { method: step.method, headers: { ...headers } };
|
|
252
|
+
if (step.method === 'POST') {
|
|
253
|
+
if (step.bodyType === 'form') {
|
|
254
|
+
init.headers = { ...init.headers, 'Content-Type': 'application/x-www-form-urlencoded' };
|
|
255
|
+
if (step.body && Object.keys(step.body).length > 0) {
|
|
256
|
+
const params = {};
|
|
257
|
+
for (const [paramName, valueSource] of Object.entries(step.body)) {
|
|
258
|
+
const resolved = interpolate(valueSource.startsWith('{{') ? valueSource : `{{${valueSource}}}`, scope, stepContext);
|
|
259
|
+
if (resolved !== '' && resolved !== 'undefined')
|
|
260
|
+
params[paramName] = resolved;
|
|
261
|
+
}
|
|
262
|
+
init.body = new URLSearchParams(params).toString();
|
|
263
|
+
}
|
|
264
|
+
else {
|
|
265
|
+
init.body = '';
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
else if ((step.bodyType === 'json' && step.bodyTemplate) || step.bodyTemplate) {
|
|
269
|
+
const body = interpolateDeep(step.bodyTemplate, scope, stepContext);
|
|
270
|
+
init.headers = { ...init.headers, 'Content-Type': 'application/json' };
|
|
271
|
+
init.body = JSON.stringify(body);
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
try {
|
|
275
|
+
const res = await fetch(url, init);
|
|
276
|
+
const text = await res.text();
|
|
277
|
+
let json = null;
|
|
278
|
+
try {
|
|
279
|
+
json = text && text.trim() ? JSON.parse(text) : {};
|
|
280
|
+
}
|
|
281
|
+
catch (parseErr) {
|
|
282
|
+
if (!res.ok) {
|
|
283
|
+
return { error: `Step ${i + 1}: ${res.status}`, detail: text.slice(0, 300) };
|
|
284
|
+
}
|
|
285
|
+
return { error: parseErr.message, detail: text.slice(0, 300) };
|
|
286
|
+
}
|
|
287
|
+
if (!res.ok) {
|
|
288
|
+
if (res.status === 401 && auth.invalidKeyMessage)
|
|
289
|
+
return { error: withSkillPageHint(auth.invalidKeyMessage, skillSlug) };
|
|
290
|
+
const stepErr = `Step ${i + 1}: ${res.status}`;
|
|
291
|
+
return {
|
|
292
|
+
error: isApiKeyRelatedError(res.status, stepErr) ? withSkillPageHint(stepErr, skillSlug) : stepErr,
|
|
293
|
+
detail: text.slice(0, 200),
|
|
294
|
+
};
|
|
295
|
+
}
|
|
296
|
+
const errMsg = typeof json === 'object' && json !== null && json.error
|
|
297
|
+
? (typeof json.error === 'object'
|
|
298
|
+
? json.error && json.error !== null && typeof json.error.message === 'string'
|
|
299
|
+
? json.error.message
|
|
300
|
+
: 'API error'
|
|
301
|
+
: String(json.error))
|
|
302
|
+
: null;
|
|
303
|
+
if (errMsg) {
|
|
304
|
+
const errStr = typeof errMsg === 'string' ? errMsg : String(errMsg);
|
|
305
|
+
return {
|
|
306
|
+
error: isApiKeyRelatedError(undefined, errStr) ? withSkillPageHint(errStr, skillSlug) : errStr,
|
|
307
|
+
};
|
|
308
|
+
}
|
|
309
|
+
lastResponse = json;
|
|
310
|
+
const stepKey = `step${i}`;
|
|
311
|
+
if (step.responsePath && typeof json === 'object' && json !== null) {
|
|
312
|
+
stepContext[stepKey] = getPath(json, step.responsePath);
|
|
313
|
+
}
|
|
314
|
+
else {
|
|
315
|
+
stepContext[stepKey] = json;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
catch (e) {
|
|
319
|
+
const msg = e.message;
|
|
320
|
+
return {
|
|
321
|
+
error: isApiKeyRelatedError(undefined, msg) ? withSkillPageHint(msg, skillSlug) : msg,
|
|
322
|
+
};
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
const resp = spec.response;
|
|
326
|
+
if (!resp && !spec.responseExtra)
|
|
327
|
+
return lastResponse;
|
|
328
|
+
let out = {};
|
|
329
|
+
if (resp?.singleKeys?.length && typeof lastResponse === 'object' && lastResponse !== null) {
|
|
330
|
+
const single = normalizeSingle(lastResponse, resp.singleKeys);
|
|
331
|
+
if (resp.outputKey)
|
|
332
|
+
out[resp.outputKey] = single;
|
|
333
|
+
else
|
|
334
|
+
out = single;
|
|
335
|
+
}
|
|
336
|
+
else if (lastResponse != null && typeof lastResponse === 'object') {
|
|
337
|
+
out = { ...lastResponse };
|
|
338
|
+
}
|
|
339
|
+
if (spec.responseExtra) {
|
|
340
|
+
for (const [k, v] of Object.entries(spec.responseExtra)) {
|
|
341
|
+
out[k] = typeof v === 'string' && v.includes('{{') ? interpolate(v, scope, stepContext) : v;
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
return Object.keys(out).length ? out : lastResponse;
|
|
345
|
+
}
|
|
346
|
+
function createExecutor(spec, skillSlug) {
|
|
347
|
+
if (spec.steps?.length) {
|
|
348
|
+
return (args) => executeSteps(spec, args, skillSlug);
|
|
349
|
+
}
|
|
350
|
+
return async (args) => {
|
|
351
|
+
for (const p of spec.parameters ?? []) {
|
|
352
|
+
if (p.required) {
|
|
353
|
+
const val = args[p.name];
|
|
354
|
+
if (val === undefined || val === null || (typeof val === 'string' && !val.trim())) {
|
|
355
|
+
return { error: `${p.name} is required` };
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
const auth = getAuth(spec.auth);
|
|
360
|
+
if ('error' in auth)
|
|
361
|
+
return {
|
|
362
|
+
error: isApiKeyRelatedError(undefined, auth.error) ? withSkillPageHint(auth.error, skillSlug) : auth.error,
|
|
363
|
+
};
|
|
364
|
+
const request = spec.request;
|
|
365
|
+
if (!request.url)
|
|
366
|
+
return { error: 'Tool spec missing request.url' };
|
|
367
|
+
let argsWithDefaults = applyDefaults(args, spec);
|
|
368
|
+
if (spec.parameters) {
|
|
369
|
+
for (const p of spec.parameters) {
|
|
370
|
+
if (p.name === 'limit' && request.queryParams?.limit) {
|
|
371
|
+
argsWithDefaults = {
|
|
372
|
+
...argsWithDefaults,
|
|
373
|
+
limit: clampLimit(argsWithDefaults.limit, 10, 100),
|
|
374
|
+
};
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
let url = buildUrl(request.url, argsWithDefaults);
|
|
379
|
+
url = applyQueryParams(url, request.queryParams, argsWithDefaults);
|
|
380
|
+
const init = {
|
|
381
|
+
method: request.method ?? 'GET',
|
|
382
|
+
headers: { ...auth.headers },
|
|
383
|
+
};
|
|
384
|
+
if (spec.name === 'discord_send_message') {
|
|
385
|
+
const content = argsWithDefaults.content;
|
|
386
|
+
if (typeof content === 'string' && content.length > 2000) {
|
|
387
|
+
argsWithDefaults = { ...argsWithDefaults, content: content.slice(0, 2000) };
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
if (request.method === 'POST' && request.bodyType === 'json' && request.bodyKeys?.length) {
|
|
391
|
+
const body = {};
|
|
392
|
+
for (const k of request.bodyKeys) {
|
|
393
|
+
if (argsWithDefaults[k] !== undefined)
|
|
394
|
+
body[k] = argsWithDefaults[k];
|
|
395
|
+
}
|
|
396
|
+
init.headers = { ...init.headers, 'Content-Type': 'application/json' };
|
|
397
|
+
init.body = JSON.stringify(body);
|
|
398
|
+
}
|
|
399
|
+
if (request.method === 'POST' && request.bodyType === 'form' && request.body && Object.keys(request.body).length > 0) {
|
|
400
|
+
const params = new URLSearchParams();
|
|
401
|
+
for (const [paramName, argName] of Object.entries(request.body)) {
|
|
402
|
+
const v = argsWithDefaults[argName];
|
|
403
|
+
if (v !== undefined && v !== null && v !== '')
|
|
404
|
+
params.set(paramName, String(v).trim());
|
|
405
|
+
}
|
|
406
|
+
init.headers = { ...init.headers, 'Content-Type': 'application/x-www-form-urlencoded' };
|
|
407
|
+
init.body = params.toString();
|
|
408
|
+
}
|
|
409
|
+
try {
|
|
410
|
+
const res = await fetch(url, init);
|
|
411
|
+
if (!res.ok) {
|
|
412
|
+
if (res.status === 401 && auth.invalidKeyMessage)
|
|
413
|
+
return { error: withSkillPageHint(auth.invalidKeyMessage, skillSlug) };
|
|
414
|
+
const text = await res.text();
|
|
415
|
+
const label = auth.label ?? 'API';
|
|
416
|
+
const statusErr = `${label} API: ${res.status}`;
|
|
417
|
+
return {
|
|
418
|
+
error: isApiKeyRelatedError(res.status, statusErr) ? withSkillPageHint(statusErr, skillSlug) : statusErr,
|
|
419
|
+
detail: text.slice(0, 200),
|
|
420
|
+
};
|
|
421
|
+
}
|
|
422
|
+
const text = typeof res.text === 'function'
|
|
423
|
+
? await res.text()
|
|
424
|
+
: '';
|
|
425
|
+
let json;
|
|
426
|
+
try {
|
|
427
|
+
json = (text ?? '').trim() ? JSON.parse(text) : {};
|
|
428
|
+
}
|
|
429
|
+
catch (e) {
|
|
430
|
+
const msg = e.message;
|
|
431
|
+
return {
|
|
432
|
+
error: isApiKeyRelatedError(undefined, msg) ? withSkillPageHint(msg, skillSlug) : msg,
|
|
433
|
+
detail: (text || msg).slice(0, 300),
|
|
434
|
+
};
|
|
435
|
+
}
|
|
436
|
+
const apiError = typeof json === 'object' && json !== null && json.error != null
|
|
437
|
+
? String(json.error)
|
|
438
|
+
: null;
|
|
439
|
+
if (apiError && isApiKeyRelatedError(undefined, apiError))
|
|
440
|
+
return { error: withSkillPageHint(apiError, skillSlug) };
|
|
441
|
+
if (apiError)
|
|
442
|
+
return { error: apiError };
|
|
443
|
+
const resp = spec.response;
|
|
444
|
+
if (!resp)
|
|
445
|
+
return json;
|
|
446
|
+
if (resp.listPath !== undefined || resp.rootIsArray) {
|
|
447
|
+
const list = normalizeList(json, resp.listPath, resp.rootIsArray, resp.itemKeys);
|
|
448
|
+
const outputKey = resp.outputKey ?? 'data';
|
|
449
|
+
const countKey = resp.countKey ?? 'count';
|
|
450
|
+
return { [outputKey]: list, [countKey]: list.length };
|
|
451
|
+
}
|
|
452
|
+
if (resp.singleKeys?.length) {
|
|
453
|
+
const single = normalizeSingle(json, resp.singleKeys);
|
|
454
|
+
const outputKey = resp.outputKey;
|
|
455
|
+
if (outputKey === 'message_id' && single.id != null) {
|
|
456
|
+
return { ok: true, message_id: single.id };
|
|
457
|
+
}
|
|
458
|
+
if (outputKey)
|
|
459
|
+
return { [outputKey]: single };
|
|
460
|
+
return single;
|
|
461
|
+
}
|
|
462
|
+
return json;
|
|
463
|
+
}
|
|
464
|
+
catch (e) {
|
|
465
|
+
return { error: e.message };
|
|
466
|
+
}
|
|
467
|
+
};
|
|
468
|
+
}
|
|
469
|
+
function loadToolsYaml(dir) {
|
|
470
|
+
const toolsPath = join(dir, 'tools.yaml');
|
|
471
|
+
if (!existsSync(toolsPath))
|
|
472
|
+
return [];
|
|
473
|
+
try {
|
|
474
|
+
const raw = readFileSync(toolsPath, 'utf8');
|
|
475
|
+
const parsed = parseYaml(raw);
|
|
476
|
+
if (!parsed?.tools || !Array.isArray(parsed.tools))
|
|
477
|
+
return [];
|
|
478
|
+
return parsed.tools;
|
|
479
|
+
}
|
|
480
|
+
catch {
|
|
481
|
+
return [];
|
|
482
|
+
}
|
|
483
|
+
}
|
|
484
|
+
/** Resolve context paths for tools.yaml: workspace skills (hub installs), agentContextPath/bundled, managed, then extra dirs. */
|
|
485
|
+
function getContextDirs(config) {
|
|
486
|
+
const cwd = process.cwd();
|
|
487
|
+
const dirs = [];
|
|
488
|
+
if (config.skillsWorkspaceDir?.trim()) {
|
|
489
|
+
dirs.push(config.skillsWorkspaceDir.trim());
|
|
490
|
+
}
|
|
491
|
+
if (config.skillsWorkspaceMyDir?.trim()) {
|
|
492
|
+
dirs.push(config.skillsWorkspaceMyDir.trim());
|
|
493
|
+
}
|
|
494
|
+
if (config.agentContextPath?.trim()) {
|
|
495
|
+
dirs.push(resolve(cwd, config.agentContextPath.trim()));
|
|
496
|
+
}
|
|
497
|
+
else if (config.skillsBundledDir?.trim()) {
|
|
498
|
+
dirs.push(config.skillsBundledDir.trim());
|
|
499
|
+
}
|
|
500
|
+
if (config.skillsManagedDir?.trim()) {
|
|
501
|
+
dirs.push(config.skillsManagedDir.trim());
|
|
502
|
+
}
|
|
503
|
+
for (const p of config.skillsExtraDirs ?? []) {
|
|
504
|
+
const s = typeof p === 'string' ? p.trim() : '';
|
|
505
|
+
if (s)
|
|
506
|
+
dirs.push(resolve(cwd, s));
|
|
507
|
+
}
|
|
508
|
+
return dirs;
|
|
509
|
+
}
|
|
510
|
+
/**
|
|
511
|
+
* Scan context dirs for subdirs that contain tools.yaml, load specs, and register one tool per spec.
|
|
512
|
+
*/
|
|
513
|
+
export function registerSpecTools(registerTool, config) {
|
|
514
|
+
const contextDirs = getContextDirs(config);
|
|
515
|
+
for (const base of contextDirs) {
|
|
516
|
+
if (!existsSync(base) || !statSync(base).isDirectory())
|
|
517
|
+
continue;
|
|
518
|
+
const subdirs = readdirSync(base, { withFileTypes: true })
|
|
519
|
+
.filter((d) => d.isDirectory() && !d.name.startsWith('.'))
|
|
520
|
+
.map((d) => join(base, d.name));
|
|
521
|
+
for (const dir of subdirs) {
|
|
522
|
+
const skillSlug = basename(dir);
|
|
523
|
+
const specs = loadToolsYaml(dir);
|
|
524
|
+
for (const spec of specs) {
|
|
525
|
+
if (!spec.name || !spec.description)
|
|
526
|
+
continue;
|
|
527
|
+
if (!spec.steps?.length && !spec.request?.url)
|
|
528
|
+
continue;
|
|
529
|
+
registerTool({
|
|
530
|
+
name: spec.name,
|
|
531
|
+
description: spec.description,
|
|
532
|
+
profile: spec.profile ?? 'full',
|
|
533
|
+
parameters: specToParameters(spec),
|
|
534
|
+
execute: createExecutor(spec, skillSlug),
|
|
535
|
+
});
|
|
536
|
+
}
|
|
537
|
+
}
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
//# sourceMappingURL=spec-loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spec-loader.js","sourceRoot":"","sources":["../../../src/agent/tool/spec-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/agent/tools.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/agent/tools.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAkB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAsB,MAAM,aAAa,CAAC;AAO/D,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAEhD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAEhD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAEzD;AASD,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IACtD,2DAA2D;IAC3D,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,qEAAqE;IACrE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,sDAAsD;AACtD,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,0DAA0D;AAC1D,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,OAAO,EAAE,EAChB,OAAO,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;CAAE,GAC9F,OAAO,EAAE,CAaX;AAED,wJAAwJ;AACxJ,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,EAAE,CA2B/D;AA0BD,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uGAAuG;IACvG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uFAAuF;IACvF,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,yKAAyK;AACzK,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED,yDAAyD;AACzD,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CA8iBhF"}
|
|
@@ -11,12 +11,13 @@ vi.mock("../channels/stripe.js", () => ({
|
|
|
11
11
|
vi.mock("../channels/discord.js", () => ({
|
|
12
12
|
getEffectiveDiscordBotToken: vi.fn(),
|
|
13
13
|
}));
|
|
14
|
-
// Mock config for list_integrations_connections (portal vs integrations URL)
|
|
14
|
+
// Mock config for list_integrations_connections (portal vs integrations URL) and spec-loader context path
|
|
15
15
|
vi.mock("../config.js", () => ({
|
|
16
16
|
config: {
|
|
17
17
|
integrationsUrl: null,
|
|
18
18
|
agentToolAllowlist: null,
|
|
19
19
|
agentToolProfile: "full",
|
|
20
|
+
agentContextPath: "context",
|
|
20
21
|
},
|
|
21
22
|
getPortalGatewayBase: vi.fn(() => null),
|
|
22
23
|
getEffectivePortalApiKey: vi.fn(() => null),
|
|
@@ -43,7 +44,7 @@ describe("integration tools", () => {
|
|
|
43
44
|
expect(tool).toBeDefined();
|
|
44
45
|
const result = await tool.execute({});
|
|
45
46
|
expect(result).toEqual({
|
|
46
|
-
error: "Stripe is not configured. Add a secret key in Settings →
|
|
47
|
+
error: "Stripe is not configured. Add a secret key in Settings → Payment or set STRIPE_SECRET_KEY.",
|
|
47
48
|
});
|
|
48
49
|
});
|
|
49
50
|
it("returns customers when configured and API returns data", async () => {
|
|
@@ -117,9 +118,7 @@ describe("integration tools", () => {
|
|
|
117
118
|
],
|
|
118
119
|
count: 2,
|
|
119
120
|
});
|
|
120
|
-
expect(mockFetch).toHaveBeenCalledWith("https://discord.com/api/v10/users/@me/guilds", {
|
|
121
|
-
headers: { Authorization: "Bot bot_token_xxx" },
|
|
122
|
-
});
|
|
121
|
+
expect(mockFetch).toHaveBeenCalledWith("https://discord.com/api/v10/users/@me/guilds", expect.objectContaining({ headers: { Authorization: "Bot bot_token_xxx" } }));
|
|
123
122
|
});
|
|
124
123
|
});
|
|
125
124
|
describe("discord_list_channels", () => {
|