@filiksyos/mcptoskill 0.2.4 → 0.2.6
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 +2 -2
- package/dist/generator.d.ts +14 -1
- package/dist/generator.d.ts.map +1 -1
- package/dist/generator.js +201 -4
- package/dist/generator.js.map +1 -1
- package/dist/index.js +58 -7
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -66,8 +66,8 @@ npx @filiksyos/mcptoskill https://mcp.notion.com/mcp --skill-key sk_live_xxx
|
|
|
66
66
|
|
|
67
67
|
## Web Page
|
|
68
68
|
|
|
69
|
-
[https://mcptoskill.
|
|
69
|
+
[https://mcptoskill.com](https://mcptoskill.com)
|
|
70
70
|
|
|
71
71
|
Generate the correct CLI command for any MCP server without leaving your browser.
|
|
72
72
|
|
|
73
|
-
**Contributing** — Fork the repo → edit
|
|
73
|
+
**Contributing** — Fork the repo → edit → open a pull request.
|
package/dist/generator.d.ts
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
import type { McpClientResult } from "./client.js";
|
|
2
|
+
export interface OAuthTokenInfo {
|
|
3
|
+
access_token: string;
|
|
4
|
+
refresh_token: string;
|
|
5
|
+
expires_in: number | null;
|
|
6
|
+
token_endpoint: string;
|
|
7
|
+
client_id: string;
|
|
8
|
+
mcp_oauth: boolean;
|
|
9
|
+
token_encoding: "basic" | "none";
|
|
10
|
+
resource_url: string | null;
|
|
11
|
+
provider: string;
|
|
12
|
+
mcp_url: string;
|
|
13
|
+
tokenFilePath?: string;
|
|
14
|
+
}
|
|
2
15
|
export interface GeneratedSkill {
|
|
3
16
|
skillName: string;
|
|
4
17
|
skillMd: string;
|
|
5
18
|
shellScript: string;
|
|
6
19
|
}
|
|
7
|
-
export declare function generate(result: McpClientResult, nameOverride?: string): GeneratedSkill;
|
|
20
|
+
export declare function generate(result: McpClientResult, nameOverride?: string, oauth?: OAuthTokenInfo): GeneratedSkill;
|
|
8
21
|
//# sourceMappingURL=generator.d.ts.map
|
package/dist/generator.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;AAEpE,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AA4WD,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,QAAQ,CACtB,MAAM,EAAE,eAAe,EACvB,YAAY,CAAC,EAAE,MAAM,EACrB,KAAK,CAAC,EAAE,cAAc,GACrB,cAAc,CAShB"}
|
package/dist/generator.js
CHANGED
|
@@ -44,7 +44,11 @@ function generateSkillMd(result, skillName) {
|
|
|
44
44
|
openclaw: { requires: { bins: [] }, always: true },
|
|
45
45
|
});
|
|
46
46
|
const desc = `${serverInfo.instructions ?? `Use ${serverInfo.name} tools.`} Triggers on: ${triggerPhrases}.`;
|
|
47
|
-
const escapedDesc = desc
|
|
47
|
+
const escapedDesc = desc
|
|
48
|
+
.replace(/\\/g, "\\\\")
|
|
49
|
+
.replace(/"/g, '\\"')
|
|
50
|
+
.replace(/\n/g, "\\n")
|
|
51
|
+
.replace(/\r/g, "\\r");
|
|
48
52
|
return [
|
|
49
53
|
"---",
|
|
50
54
|
`name: ${skillName}`,
|
|
@@ -74,7 +78,7 @@ function generateSkillMd(result, skillName) {
|
|
|
74
78
|
function curlHeaderLines(extraHeaders) {
|
|
75
79
|
return Object.entries(extraHeaders).map(([k, v]) => ` -H "${k}: ${v}" \\`);
|
|
76
80
|
}
|
|
77
|
-
function
|
|
81
|
+
function generateStaticShellScript(result, skillName) {
|
|
78
82
|
const { serverUrl, extraHeaders } = result;
|
|
79
83
|
const headerLines = curlHeaderLines(extraHeaders);
|
|
80
84
|
const initBody = JSON.stringify({
|
|
@@ -137,12 +141,205 @@ function generateShellScript(result, skillName) {
|
|
|
137
141
|
];
|
|
138
142
|
return lines.join("\n");
|
|
139
143
|
}
|
|
140
|
-
|
|
144
|
+
function generateOAuthShellScript(result, skillName, oauth) {
|
|
145
|
+
const { serverUrl } = result;
|
|
146
|
+
const tokenFilePath = oauth.tokenFilePath
|
|
147
|
+
?? `$HOME/.openclaw/mcptoskill/tokens/${skillName}.json`;
|
|
148
|
+
const initBody = JSON.stringify({
|
|
149
|
+
jsonrpc: "2.0",
|
|
150
|
+
id: 0,
|
|
151
|
+
method: "initialize",
|
|
152
|
+
params: {
|
|
153
|
+
protocolVersion: "2024-11-05",
|
|
154
|
+
capabilities: {},
|
|
155
|
+
clientInfo: { name: "mcptoskill", version: "0.1.0" },
|
|
156
|
+
},
|
|
157
|
+
});
|
|
158
|
+
const refreshFunction = oauth.mcp_oauth
|
|
159
|
+
? generateClientSideRefreshFunction(oauth)
|
|
160
|
+
: generateProxiedRefreshFunction(oauth);
|
|
161
|
+
const lines = [
|
|
162
|
+
"#!/bin/bash",
|
|
163
|
+
`# Generated by mcptoskill — https://mcptoskill.com`,
|
|
164
|
+
`# Server: ${result.serverInfo.name} v${result.serverInfo.version}`,
|
|
165
|
+
`# URL: ${serverUrl}`,
|
|
166
|
+
`# OAuth: ${oauth.provider} (auto-refresh enabled)`,
|
|
167
|
+
"set -euo pipefail",
|
|
168
|
+
"",
|
|
169
|
+
`TOOL_NAME="\${1:?Usage: ${skillName}.sh <tool-name> '<json-args>'}"`,
|
|
170
|
+
`ARGS="\${2:-}"`,
|
|
171
|
+
`[ -z "$ARGS" ] && ARGS='{}'`,
|
|
172
|
+
`MCP_URL="${serverUrl}"`,
|
|
173
|
+
`TOKEN_FILE="${tokenFilePath}"`,
|
|
174
|
+
"",
|
|
175
|
+
"# --- Token management ---",
|
|
176
|
+
"",
|
|
177
|
+
"read_token() {",
|
|
178
|
+
" if [ ! -f \"$TOKEN_FILE\" ]; then",
|
|
179
|
+
` echo "Error: token file not found at $TOKEN_FILE" >&2`,
|
|
180
|
+
` echo "Re-run: npx @filiksyos/mcptoskill ${serverUrl} --skill-key <key>" >&2`,
|
|
181
|
+
" exit 1",
|
|
182
|
+
" fi",
|
|
183
|
+
" ACCESS_TOKEN=$(jq -r '.access_token' \"$TOKEN_FILE\")",
|
|
184
|
+
"}",
|
|
185
|
+
"",
|
|
186
|
+
"is_expired() {",
|
|
187
|
+
" local expires_at",
|
|
188
|
+
" expires_at=$(jq -r '.expires_at // 0' \"$TOKEN_FILE\")",
|
|
189
|
+
" if [ \"$expires_at\" = \"null\" ] || [ \"$expires_at\" = \"0\" ]; then",
|
|
190
|
+
" return 1",
|
|
191
|
+
" fi",
|
|
192
|
+
" local now",
|
|
193
|
+
" now=$(date +%s)",
|
|
194
|
+
" [ \"$now\" -ge \"$((expires_at - 60))\" ]",
|
|
195
|
+
"}",
|
|
196
|
+
"",
|
|
197
|
+
...refreshFunction,
|
|
198
|
+
"",
|
|
199
|
+
"ensure_fresh_token() {",
|
|
200
|
+
" read_token",
|
|
201
|
+
" if is_expired; then",
|
|
202
|
+
" refresh_token_flow",
|
|
203
|
+
" read_token",
|
|
204
|
+
" fi",
|
|
205
|
+
"}",
|
|
206
|
+
"",
|
|
207
|
+
"ensure_fresh_token",
|
|
208
|
+
"",
|
|
209
|
+
"# --- MCP call ---",
|
|
210
|
+
"",
|
|
211
|
+
"AUTH_HEADER=\"Authorization: Bearer $ACCESS_TOKEN\"",
|
|
212
|
+
"",
|
|
213
|
+
"TEMP_HEADERS=$(mktemp)",
|
|
214
|
+
"curl -s -X POST \"$MCP_URL\" \\",
|
|
215
|
+
" -H \"Content-Type: application/json\" \\",
|
|
216
|
+
" -H \"Accept: application/json, text/event-stream\" \\",
|
|
217
|
+
" -H \"$AUTH_HEADER\" \\",
|
|
218
|
+
" -D \"$TEMP_HEADERS\" \\",
|
|
219
|
+
` -d '${initBody}' > /dev/null`,
|
|
220
|
+
"",
|
|
221
|
+
"SESSION_ID=$(grep -i \"^mcp-session-id:\" \"$TEMP_HEADERS\" | awk '{print $2}' | tr -d '\\r' || true)",
|
|
222
|
+
"rm -f \"$TEMP_HEADERS\"",
|
|
223
|
+
"",
|
|
224
|
+
"if [ -n \"$SESSION_ID\" ]; then",
|
|
225
|
+
" RESPONSE=$(curl -s -X POST \"$MCP_URL\" \\",
|
|
226
|
+
" -H \"Content-Type: application/json\" \\",
|
|
227
|
+
" -H \"Accept: application/json, text/event-stream\" \\",
|
|
228
|
+
" -H \"$AUTH_HEADER\" \\",
|
|
229
|
+
" -H \"Mcp-Session-Id: $SESSION_ID\" \\",
|
|
230
|
+
` -d "{\\"jsonrpc\\":\\"2.0\\",\\"id\\":1,\\"method\\":\\"tools/call\\",\\"params\\":{\\"name\\":\\"$TOOL_NAME\\",\\"arguments\\":$ARGS}}")`,
|
|
231
|
+
"else",
|
|
232
|
+
" RESPONSE=$(curl -s -X POST \"$MCP_URL\" \\",
|
|
233
|
+
" -H \"Content-Type: application/json\" \\",
|
|
234
|
+
" -H \"Accept: application/json, text/event-stream\" \\",
|
|
235
|
+
" -H \"$AUTH_HEADER\" \\",
|
|
236
|
+
` -d "{\\"jsonrpc\\":\\"2.0\\",\\"id\\":1,\\"method\\":\\"tools/call\\",\\"params\\":{\\"name\\":\\"$TOOL_NAME\\",\\"arguments\\":$ARGS}}")`,
|
|
237
|
+
"fi",
|
|
238
|
+
"",
|
|
239
|
+
"# Handle SSE format (event: message / data: {...}) or plain JSON",
|
|
240
|
+
"if echo \"$RESPONSE\" | grep -q '^data: '; then",
|
|
241
|
+
" echo \"$RESPONSE\" | grep '^data: ' | tail -1 | sed 's/^data: //'",
|
|
242
|
+
"else",
|
|
243
|
+
" echo \"$RESPONSE\"",
|
|
244
|
+
"fi",
|
|
245
|
+
"",
|
|
246
|
+
];
|
|
247
|
+
return lines.join("\n");
|
|
248
|
+
}
|
|
249
|
+
function generateClientSideRefreshFunction(oauth) {
|
|
250
|
+
const resourceParam = oauth.resource_url
|
|
251
|
+
? `\n REFRESH_BODY="$REFRESH_BODY&resource=${encodeURIComponent(oauth.resource_url)}"`
|
|
252
|
+
: "";
|
|
253
|
+
return [
|
|
254
|
+
"refresh_token_flow() {",
|
|
255
|
+
" local rt token_endpoint client_id",
|
|
256
|
+
" rt=$(jq -r '.refresh_token // empty' \"$TOKEN_FILE\")",
|
|
257
|
+
" token_endpoint=$(jq -r '.token_endpoint // empty' \"$TOKEN_FILE\")",
|
|
258
|
+
" client_id=$(jq -r '.client_id // empty' \"$TOKEN_FILE\")",
|
|
259
|
+
"",
|
|
260
|
+
" if [ -z \"$rt\" ]; then",
|
|
261
|
+
` echo "Error: no refresh token — re-authenticate at mcptoskill.com" >&2`,
|
|
262
|
+
" exit 1",
|
|
263
|
+
" fi",
|
|
264
|
+
"",
|
|
265
|
+
" REFRESH_BODY=\"grant_type=refresh_token&refresh_token=$rt&client_id=$client_id\"" +
|
|
266
|
+
resourceParam,
|
|
267
|
+
"",
|
|
268
|
+
" local resp",
|
|
269
|
+
" resp=$(curl -s -X POST \"$token_endpoint\" \\",
|
|
270
|
+
" -H \"Content-Type: application/x-www-form-urlencoded\" \\",
|
|
271
|
+
" -d \"$REFRESH_BODY\")",
|
|
272
|
+
"",
|
|
273
|
+
" local new_at",
|
|
274
|
+
" new_at=$(echo \"$resp\" | jq -r '.access_token // empty')",
|
|
275
|
+
" if [ -z \"$new_at\" ]; then",
|
|
276
|
+
` echo "Error: token refresh failed — re-authenticate at mcptoskill.com" >&2`,
|
|
277
|
+
" echo \"$resp\" >&2",
|
|
278
|
+
" exit 1",
|
|
279
|
+
" fi",
|
|
280
|
+
"",
|
|
281
|
+
" local new_rt new_exp now new_expires_at",
|
|
282
|
+
" new_rt=$(echo \"$resp\" | jq -r '.refresh_token // empty')",
|
|
283
|
+
" new_exp=$(echo \"$resp\" | jq -r '.expires_in // 3600')",
|
|
284
|
+
" now=$(date +%s)",
|
|
285
|
+
" new_expires_at=$((now + new_exp))",
|
|
286
|
+
"",
|
|
287
|
+
" jq --arg at \"$new_at\" \\",
|
|
288
|
+
" --arg rt \"${new_rt:-$rt}\" \\",
|
|
289
|
+
" --argjson ea \"$new_expires_at\" \\",
|
|
290
|
+
" '.access_token=$at | .refresh_token=$rt | .expires_at=$ea' \\",
|
|
291
|
+
" \"$TOKEN_FILE\" > \"${TOKEN_FILE}.tmp\" && mv \"${TOKEN_FILE}.tmp\" \"$TOKEN_FILE\"",
|
|
292
|
+
" chmod 600 \"$TOKEN_FILE\"",
|
|
293
|
+
"}",
|
|
294
|
+
];
|
|
295
|
+
}
|
|
296
|
+
function generateProxiedRefreshFunction(oauth) {
|
|
297
|
+
return [
|
|
298
|
+
"refresh_token_flow() {",
|
|
299
|
+
" local rt",
|
|
300
|
+
" rt=$(jq -r '.refresh_token // empty' \"$TOKEN_FILE\")",
|
|
301
|
+
"",
|
|
302
|
+
" if [ -z \"$rt\" ]; then",
|
|
303
|
+
` echo "Error: no refresh token — re-authenticate at mcptoskill.com" >&2`,
|
|
304
|
+
" exit 1",
|
|
305
|
+
" fi",
|
|
306
|
+
"",
|
|
307
|
+
" local resp",
|
|
308
|
+
` resp=$(curl -s -X POST "https://mcptoskill.com/api/refresh/${oauth.provider}" \\`,
|
|
309
|
+
" -H \"Content-Type: application/json\" \\",
|
|
310
|
+
" -d \"{\\\"refresh_token\\\":\\\"$rt\\\"}\") ",
|
|
311
|
+
"",
|
|
312
|
+
" local new_at",
|
|
313
|
+
" new_at=$(echo \"$resp\" | jq -r '.access_token // empty')",
|
|
314
|
+
" if [ -z \"$new_at\" ]; then",
|
|
315
|
+
` echo "Error: token refresh failed — re-authenticate at mcptoskill.com" >&2`,
|
|
316
|
+
" echo \"$resp\" >&2",
|
|
317
|
+
" exit 1",
|
|
318
|
+
" fi",
|
|
319
|
+
"",
|
|
320
|
+
" local new_rt new_exp now new_expires_at",
|
|
321
|
+
" new_rt=$(echo \"$resp\" | jq -r '.refresh_token // empty')",
|
|
322
|
+
" new_exp=$(echo \"$resp\" | jq -r '.expires_in // 3600')",
|
|
323
|
+
" now=$(date +%s)",
|
|
324
|
+
" new_expires_at=$((now + new_exp))",
|
|
325
|
+
"",
|
|
326
|
+
" jq --arg at \"$new_at\" \\",
|
|
327
|
+
" --arg rt \"${new_rt:-$rt}\" \\",
|
|
328
|
+
" --argjson ea \"$new_expires_at\" \\",
|
|
329
|
+
" '.access_token=$at | .refresh_token=$rt | .expires_at=$ea' \\",
|
|
330
|
+
" \"$TOKEN_FILE\" > \"${TOKEN_FILE}.tmp\" && mv \"${TOKEN_FILE}.tmp\" \"$TOKEN_FILE\"",
|
|
331
|
+
" chmod 600 \"$TOKEN_FILE\"",
|
|
332
|
+
"}",
|
|
333
|
+
];
|
|
334
|
+
}
|
|
335
|
+
export function generate(result, nameOverride, oauth) {
|
|
141
336
|
const skillName = nameOverride ?? slugify(result.serverInfo.name);
|
|
142
337
|
return {
|
|
143
338
|
skillName,
|
|
144
339
|
skillMd: generateSkillMd(result, skillName),
|
|
145
|
-
shellScript:
|
|
340
|
+
shellScript: oauth
|
|
341
|
+
? generateOAuthShellScript(result, skillName, oauth)
|
|
342
|
+
: generateStaticShellScript(result, skillName),
|
|
146
343
|
};
|
|
147
344
|
}
|
|
148
345
|
//# sourceMappingURL=generator.js.map
|
package/dist/generator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -8,6 +8,7 @@ import { generate } from "./generator.js";
|
|
|
8
8
|
const OPENCLAW_DIR = join(homedir(), ".openclaw");
|
|
9
9
|
const OPENCLAW_SKILLS_DIR = join(OPENCLAW_DIR, "skills");
|
|
10
10
|
const OPENCLAW_CONFIG = join(OPENCLAW_DIR, "openclaw.json");
|
|
11
|
+
const MCPTOSKILL_TOKENS_DIR = join(OPENCLAW_DIR, "mcptoskill", "tokens");
|
|
11
12
|
function parseArgs(argv) {
|
|
12
13
|
const args = argv.slice(2);
|
|
13
14
|
const url = args.find((a) => !a.startsWith("--"));
|
|
@@ -83,8 +84,29 @@ async function updateOpenClawConfig(skillName) {
|
|
|
83
84
|
config.skills = skills;
|
|
84
85
|
await writeFile(OPENCLAW_CONFIG, JSON.stringify(config, null, 2) + "\n", "utf8");
|
|
85
86
|
}
|
|
87
|
+
async function saveTokenFile(skillName, data) {
|
|
88
|
+
await mkdir(MCPTOSKILL_TOKENS_DIR, { recursive: true });
|
|
89
|
+
const tokenFilePath = join(MCPTOSKILL_TOKENS_DIR, `${skillName}.json`);
|
|
90
|
+
const now = Math.floor(Date.now() / 1000);
|
|
91
|
+
const tokenData = {
|
|
92
|
+
access_token: data.access_token,
|
|
93
|
+
refresh_token: data.refresh_token,
|
|
94
|
+
expires_at: data.expires_in ? now + data.expires_in : null,
|
|
95
|
+
token_endpoint: data.token_endpoint,
|
|
96
|
+
client_id: data.client_id,
|
|
97
|
+
mcp_oauth: data.mcp_oauth,
|
|
98
|
+
token_encoding: data.token_encoding,
|
|
99
|
+
resource_url: data.resource_url,
|
|
100
|
+
provider: data.provider,
|
|
101
|
+
mcp_url: data.mcp_url,
|
|
102
|
+
};
|
|
103
|
+
await writeFile(tokenFilePath, JSON.stringify(tokenData, null, 2) + "\n", "utf8");
|
|
104
|
+
await chmod(tokenFilePath, 0o600);
|
|
105
|
+
return tokenFilePath;
|
|
106
|
+
}
|
|
86
107
|
async function main() {
|
|
87
108
|
const { url, name, outDir, headers, skillKey } = parseArgs(process.argv);
|
|
109
|
+
let oauthTokenInfo;
|
|
88
110
|
if (skillKey) {
|
|
89
111
|
const controller = new AbortController();
|
|
90
112
|
const timeout = setTimeout(() => controller.abort(), 5000);
|
|
@@ -98,6 +120,20 @@ async function main() {
|
|
|
98
120
|
}
|
|
99
121
|
const data = (await res.json());
|
|
100
122
|
headers["Authorization"] = `Bearer ${data.access_token}`;
|
|
123
|
+
if (data.refresh_token) {
|
|
124
|
+
oauthTokenInfo = {
|
|
125
|
+
access_token: data.access_token,
|
|
126
|
+
refresh_token: data.refresh_token,
|
|
127
|
+
expires_in: data.expires_in,
|
|
128
|
+
token_endpoint: data.token_endpoint ?? "",
|
|
129
|
+
client_id: data.client_id ?? "",
|
|
130
|
+
mcp_oauth: data.mcp_oauth ?? false,
|
|
131
|
+
token_encoding: data.token_encoding ?? "none",
|
|
132
|
+
resource_url: data.resource_url ?? null,
|
|
133
|
+
provider: data.provider,
|
|
134
|
+
mcp_url: data.mcp_url,
|
|
135
|
+
};
|
|
136
|
+
}
|
|
101
137
|
}
|
|
102
138
|
catch {
|
|
103
139
|
console.error("Error: skill key not found — visit mcptoskill.com to reconnect");
|
|
@@ -113,36 +149,51 @@ async function main() {
|
|
|
113
149
|
for (const t of result.tools) {
|
|
114
150
|
console.log(` • ${t.name}: ${t.description.slice(0, 80)}${t.description.length > 80 ? "…" : ""}`);
|
|
115
151
|
}
|
|
116
|
-
const
|
|
117
|
-
|
|
152
|
+
const skillName = name ?? result.serverInfo.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
|
|
153
|
+
let tokenFilePath;
|
|
154
|
+
if (oauthTokenInfo) {
|
|
155
|
+
tokenFilePath = await saveTokenFile(skillName, {
|
|
156
|
+
...oauthTokenInfo,
|
|
157
|
+
workspace_name: null,
|
|
158
|
+
});
|
|
159
|
+
console.log(`✓ Token saved: ${tokenFilePath}`);
|
|
160
|
+
}
|
|
161
|
+
const { skillName: finalSkillName, skillMd, shellScript } = generate(result, name, oauthTokenInfo ? { ...oauthTokenInfo, tokenFilePath: tokenFilePath } : undefined);
|
|
162
|
+
const skillDir = join(outDir, finalSkillName);
|
|
118
163
|
const scriptsDir = join(skillDir, "scripts");
|
|
119
164
|
await mkdir(scriptsDir, { recursive: true });
|
|
120
165
|
const skillMdPath = join(skillDir, "SKILL.md");
|
|
121
|
-
const scriptPath = join(scriptsDir, `${
|
|
166
|
+
const scriptPath = join(scriptsDir, `${finalSkillName}.sh`);
|
|
122
167
|
await writeFile(skillMdPath, skillMd, "utf8");
|
|
123
168
|
await writeFile(scriptPath, shellScript, "utf8");
|
|
124
169
|
await chmod(scriptPath, 0o755);
|
|
125
170
|
const localScriptsDir = join(process.cwd(), "scripts");
|
|
126
171
|
await mkdir(localScriptsDir, { recursive: true });
|
|
127
|
-
const localScriptPath = join(localScriptsDir, `${
|
|
172
|
+
const localScriptPath = join(localScriptsDir, `${finalSkillName}.sh`);
|
|
128
173
|
await copyFile(scriptPath, localScriptPath);
|
|
129
174
|
await chmod(localScriptPath, 0o755);
|
|
130
175
|
console.log(`✓ Copied to local workspace: ${localScriptPath}`);
|
|
131
176
|
const isOpenClawInstall = resolve(outDir) === resolve(OPENCLAW_SKILLS_DIR);
|
|
132
177
|
if (isOpenClawInstall) {
|
|
133
|
-
await updateOpenClawConfig(
|
|
178
|
+
await updateOpenClawConfig(finalSkillName);
|
|
134
179
|
console.log("");
|
|
135
|
-
console.log(`✓ Skill installed: ${
|
|
180
|
+
console.log(`✓ Skill installed: ${finalSkillName}`);
|
|
136
181
|
console.log(` ${skillDir}/`);
|
|
182
|
+
if (oauthTokenInfo) {
|
|
183
|
+
console.log(` Token auto-refresh enabled (${oauthTokenInfo.provider})`);
|
|
184
|
+
}
|
|
137
185
|
console.log("");
|
|
138
186
|
console.log("Restart OpenClaw (or wait for auto-reload), then try:");
|
|
139
187
|
console.log(` "use ${result.serverInfo.name} to ${result.tools[0]?.name?.replace(/-/g, " ") ?? "run a tool"}"`);
|
|
140
188
|
}
|
|
141
189
|
else {
|
|
142
190
|
console.log("");
|
|
143
|
-
console.log(`Generated skill: ${
|
|
191
|
+
console.log(`Generated skill: ${finalSkillName}`);
|
|
144
192
|
console.log(` ${skillMdPath}`);
|
|
145
193
|
console.log(` ${scriptPath}`);
|
|
194
|
+
if (oauthTokenInfo) {
|
|
195
|
+
console.log(` Token auto-refresh enabled (${oauthTokenInfo.provider})`);
|
|
196
|
+
}
|
|
146
197
|
console.log("");
|
|
147
198
|
console.log("To install in OpenClaw:");
|
|
148
199
|
console.log(` cp -r ${skillDir} ${OPENCLAW_SKILLS_DIR}/`);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|