reskill 1.18.0 → 1.18.1
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/cli/index.js +14 -2
- package/dist/core/skill-manager.d.ts +6 -1
- package/dist/core/skill-manager.d.ts.map +1 -1
- package/dist/index.js +14 -2
- package/package.json +1 -1
package/dist/cli/index.js
CHANGED
|
@@ -4305,14 +4305,17 @@ class RegistryResolver {
|
|
|
4305
4305
|
*
|
|
4306
4306
|
* Resolution order:
|
|
4307
4307
|
* 1. Explicit CLI override (options.registry)
|
|
4308
|
-
* 2. Scoped skills → getRegistryUrl(scope)
|
|
4308
|
+
* 2. Scoped skills → getRegistryUrl(scope, scopeRegistries from skills.json)
|
|
4309
4309
|
* 3. Unscoped skills → lock file registry (O(1), no network)
|
|
4310
4310
|
* 4. Unscoped skills → probe skills.json registries (non-git-host, network)
|
|
4311
4311
|
* 5. Default → PUBLIC_REGISTRY
|
|
4312
4312
|
*/ async resolveRegistryUrl(ref, explicitRegistry) {
|
|
4313
4313
|
if (explicitRegistry) return explicitRegistry;
|
|
4314
4314
|
const parsed = parseSkillIdentifier(ref);
|
|
4315
|
-
if (parsed.scope)
|
|
4315
|
+
if (parsed.scope) {
|
|
4316
|
+
const scopeRegistries = this.getScopeRegistriesFromConfig();
|
|
4317
|
+
return getRegistryUrl(parsed.scope, scopeRegistries);
|
|
4318
|
+
}
|
|
4316
4319
|
// Fast path: lock file has registry URL
|
|
4317
4320
|
const locked = this.lockManager.get(parsed.name);
|
|
4318
4321
|
if (locked?.registry) return locked.registry;
|
|
@@ -4344,6 +4347,15 @@ class RegistryResolver {
|
|
|
4344
4347
|
return gitHostPatterns.some((pattern)=>normalizedUrl.includes(pattern));
|
|
4345
4348
|
}
|
|
4346
4349
|
/**
|
|
4350
|
+
* Extract @scope-prefixed entries from skills.json registries
|
|
4351
|
+
* so users can configure custom scope→registry mappings declaratively.
|
|
4352
|
+
*/ getScopeRegistriesFromConfig() {
|
|
4353
|
+
const registries = this.config.getRegistries();
|
|
4354
|
+
const scopeRegistries = {};
|
|
4355
|
+
for (const [name, url] of Object.entries(registries))if (name.startsWith('@')) scopeRegistries[name] = url;
|
|
4356
|
+
return scopeRegistries;
|
|
4357
|
+
}
|
|
4358
|
+
/**
|
|
4347
4359
|
* Derive a registry name from a URL for storing in skills.json.registries.
|
|
4348
4360
|
* Returns null for git hosts (already in DEFAULT_REGISTRIES).
|
|
4349
4361
|
*/ deriveRegistryName(registryUrl) {
|
|
@@ -118,7 +118,7 @@ export declare class SkillManager {
|
|
|
118
118
|
*
|
|
119
119
|
* Resolution order:
|
|
120
120
|
* 1. Explicit CLI override (options.registry)
|
|
121
|
-
* 2. Scoped skills → getRegistryUrl(scope)
|
|
121
|
+
* 2. Scoped skills → getRegistryUrl(scope, scopeRegistries from skills.json)
|
|
122
122
|
* 3. Unscoped skills → lock file registry (O(1), no network)
|
|
123
123
|
* 4. Unscoped skills → probe skills.json registries (non-git-host, network)
|
|
124
124
|
* 5. Default → PUBLIC_REGISTRY
|
|
@@ -129,6 +129,11 @@ export declare class SkillManager {
|
|
|
129
129
|
* Git hosts are not skill registries and should be skipped during probe.
|
|
130
130
|
*/
|
|
131
131
|
private isGitHostRegistry;
|
|
132
|
+
/**
|
|
133
|
+
* Extract @scope-prefixed entries from skills.json registries
|
|
134
|
+
* so users can configure custom scope→registry mappings declaratively.
|
|
135
|
+
*/
|
|
136
|
+
private getScopeRegistriesFromConfig;
|
|
132
137
|
/**
|
|
133
138
|
* Derive a registry name from a URL for storing in skills.json.registries.
|
|
134
139
|
* Returns null for git hosts (already in DEFAULT_REGISTRIES).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-manager.d.ts","sourceRoot":"","sources":["../../src/core/skill-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAIf,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-manager.d.ts","sourceRoot":"","sources":["../../src/core/skill-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -4690,14 +4690,17 @@ class RegistryResolver {
|
|
|
4690
4690
|
*
|
|
4691
4691
|
* Resolution order:
|
|
4692
4692
|
* 1. Explicit CLI override (options.registry)
|
|
4693
|
-
* 2. Scoped skills → getRegistryUrl(scope)
|
|
4693
|
+
* 2. Scoped skills → getRegistryUrl(scope, scopeRegistries from skills.json)
|
|
4694
4694
|
* 3. Unscoped skills → lock file registry (O(1), no network)
|
|
4695
4695
|
* 4. Unscoped skills → probe skills.json registries (non-git-host, network)
|
|
4696
4696
|
* 5. Default → PUBLIC_REGISTRY
|
|
4697
4697
|
*/ async resolveRegistryUrl(ref, explicitRegistry) {
|
|
4698
4698
|
if (explicitRegistry) return explicitRegistry;
|
|
4699
4699
|
const parsed = parseSkillIdentifier(ref);
|
|
4700
|
-
if (parsed.scope)
|
|
4700
|
+
if (parsed.scope) {
|
|
4701
|
+
const scopeRegistries = this.getScopeRegistriesFromConfig();
|
|
4702
|
+
return getRegistryUrl(parsed.scope, scopeRegistries);
|
|
4703
|
+
}
|
|
4701
4704
|
// Fast path: lock file has registry URL
|
|
4702
4705
|
const locked = this.lockManager.get(parsed.name);
|
|
4703
4706
|
if (locked?.registry) return locked.registry;
|
|
@@ -4729,6 +4732,15 @@ class RegistryResolver {
|
|
|
4729
4732
|
return gitHostPatterns.some((pattern)=>normalizedUrl.includes(pattern));
|
|
4730
4733
|
}
|
|
4731
4734
|
/**
|
|
4735
|
+
* Extract @scope-prefixed entries from skills.json registries
|
|
4736
|
+
* so users can configure custom scope→registry mappings declaratively.
|
|
4737
|
+
*/ getScopeRegistriesFromConfig() {
|
|
4738
|
+
const registries = this.config.getRegistries();
|
|
4739
|
+
const scopeRegistries = {};
|
|
4740
|
+
for (const [name, url] of Object.entries(registries))if (name.startsWith('@')) scopeRegistries[name] = url;
|
|
4741
|
+
return scopeRegistries;
|
|
4742
|
+
}
|
|
4743
|
+
/**
|
|
4732
4744
|
* Derive a registry name from a URL for storing in skills.json.registries.
|
|
4733
4745
|
* Returns null for git hosts (already in DEFAULT_REGISTRIES).
|
|
4734
4746
|
*/ deriveRegistryName(registryUrl) {
|